diff --git a/application/views/helpers/Auth.php b/application/views/helpers/Auth.php index a996af02d..79077892f 100755 --- a/application/views/helpers/Auth.php +++ b/application/views/helpers/Auth.php @@ -5,21 +5,21 @@ /** * Icinga 2 Web - Head for multiple monitoring frontends * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @author Icinga Development Team */ diff --git a/application/views/helpers/Href.php b/application/views/helpers/Href.php index 2a4e36adf..52435b1ec 100644 --- a/application/views/helpers/Href.php +++ b/application/views/helpers/Href.php @@ -3,24 +3,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php index 0f52505e1..47ec67602 100755 --- a/library/Icinga/Application/Loader.php +++ b/library/Icinga/Application/Loader.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php index 120a7f655..43b0a186e 100755 --- a/library/Icinga/Application/Logger.php +++ b/library/Icinga/Application/Logger.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php index 643624f0d..eade05e30 100644 --- a/library/Icinga/Authentication/Backend/LdapUserBackend.php +++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Authentication/Credential.php b/library/Icinga/Authentication/Credential.php index d3d8d0604..6f96e2ac2 100644 --- a/library/Icinga/Authentication/Credential.php +++ b/library/Icinga/Authentication/Credential.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php index 87e746fb4..43fa6b839 100644 --- a/library/Icinga/Authentication/Manager.php +++ b/library/Icinga/Authentication/Manager.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team @@ -376,7 +376,7 @@ class Manager { $this->session->set('user', $this->user); } - + /** * Tries to authenticate the user with the current session **/ diff --git a/library/Icinga/Authentication/PhpSession.php b/library/Icinga/Authentication/PhpSession.php index 8f2ee7f03..e2bea651e 100644 --- a/library/Icinga/Authentication/PhpSession.php +++ b/library/Icinga/Authentication/PhpSession.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Authentication/Session.php b/library/Icinga/Authentication/Session.php index 0c098b5a3..b94528c0e 100644 --- a/library/Icinga/Authentication/Session.php +++ b/library/Icinga/Authentication/Session.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php index 5c75b065e..0b280ccda 100644 --- a/library/Icinga/Authentication/UserBackend.php +++ b/library/Icinga/Authentication/UserBackend.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Data/AbstractQuery.php b/library/Icinga/Data/AbstractQuery.php index 7df883a75..7bed9b472 100644 --- a/library/Icinga/Data/AbstractQuery.php +++ b/library/Icinga/Data/AbstractQuery.php @@ -81,7 +81,7 @@ abstract class AbstractQuery { return null; } - + /** * Choose a table and the colums you are interested in * @@ -110,7 +110,7 @@ abstract class AbstractQuery } return $this; } - + /** * Use once or multiple times to filter result set * @@ -173,7 +173,7 @@ abstract class AbstractQuery { return self::SORT_ASC; } - + /** * Limit the result set * diff --git a/library/Icinga/Data/Db/Query.php b/library/Icinga/Data/Db/Query.php index 7034e0fd6..2030e1bf6 100644 --- a/library/Icinga/Data/Db/Query.php +++ b/library/Icinga/Data/Db/Query.php @@ -49,7 +49,7 @@ class Query extends AbstractQuery } return $this->selectQuery; } - + protected function getCountQuery() { if ($this->countQuery === null) { @@ -80,7 +80,7 @@ class Query extends AbstractQuery } $this->countQuery->columns($this->countColumns); } - + protected function beforeCreatingCountQuery() { } @@ -93,7 +93,7 @@ class Query extends AbstractQuery { return $this->db->fetchOne($this->getCountQuery()); } - + public function fetchAll() { return $this->db->fetchAll($this->getSelectQuery()); diff --git a/library/Icinga/Data/Filter.php b/library/Icinga/Data/Filter.php index c070c139b..70088d918 100644 --- a/library/Icinga/Data/Filter.php +++ b/library/Icinga/Data/Filter.php @@ -33,7 +33,7 @@ class Filter extends ArrayIterator foreach ($params as $k => $v) { $filter[] = array($k, $v); } - return $filter; + return $filter; } /** diff --git a/library/Icinga/Exception/ConfigurationError.php b/library/Icinga/Exception/ConfigurationError.php index 1fc302cbf..0e037a80a 100644 --- a/library/Icinga/Exception/ConfigurationError.php +++ b/library/Icinga/Exception/ConfigurationError.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Exception/MissingParameterException.php b/library/Icinga/Exception/MissingParameterException.php index 30d1d64ca..77c97ddc8 100644 --- a/library/Icinga/Exception/MissingParameterException.php +++ b/library/Icinga/Exception/MissingParameterException.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Exception/NotImplementedError.php b/library/Icinga/Exception/NotImplementedError.php index 62daaf4cd..f2815edd6 100644 --- a/library/Icinga/Exception/NotImplementedError.php +++ b/library/Icinga/Exception/NotImplementedError.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Exception/ProgrammingError.php b/library/Icinga/Exception/ProgrammingError.php index 3c50c617f..b36cf8bc7 100644 --- a/library/Icinga/Exception/ProgrammingError.php +++ b/library/Icinga/Exception/ProgrammingError.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Exception/SystemPermissionException.php b/library/Icinga/Exception/SystemPermissionException.php index 5dde6936a..e8124cae6 100644 --- a/library/Icinga/Exception/SystemPermissionException.php +++ b/library/Icinga/Exception/SystemPermissionException.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/File/Csv.php b/library/Icinga/File/Csv.php index ae116294f..0aefd0310 100644 --- a/library/Icinga/File/Csv.php +++ b/library/Icinga/File/Csv.php @@ -22,9 +22,9 @@ class Csv public function dump() { header('Content-type: text/csv'); - echo (string) $this; + echo (string) $this; } - + public function __toString() { $first = true; diff --git a/library/Icinga/Protocol/AbstractQuery.php b/library/Icinga/Protocol/AbstractQuery.php index 07aedd6cd..26b77d0f3 100755 --- a/library/Icinga/Protocol/AbstractQuery.php +++ b/library/Icinga/Protocol/AbstractQuery.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Commandpipe/Comment.php b/library/Icinga/Protocol/Commandpipe/Comment.php index ac55bfd15..f5deaecf8 100644 --- a/library/Icinga/Protocol/Commandpipe/Comment.php +++ b/library/Icinga/Protocol/Commandpipe/Comment.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Commandpipe/Downtime.php b/library/Icinga/Protocol/Commandpipe/Downtime.php index fe0f246e2..1eef5925d 100644 --- a/library/Icinga/Protocol/Commandpipe/Downtime.php +++ b/library/Icinga/Protocol/Commandpipe/Downtime.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php b/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php index 8bf8cc4cd..d201ac9b7 100644 --- a/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php +++ b/library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Commandpipe/PropertyModifier.php b/library/Icinga/Protocol/Commandpipe/PropertyModifier.php index 8dd72a1a0..9abc7e836 100644 --- a/library/Icinga/Protocol/Commandpipe/PropertyModifier.php +++ b/library/Icinga/Protocol/Commandpipe/PropertyModifier.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/Exception.php index 2197b2907..33c756c15 100644 --- a/library/Icinga/Protocol/Ldap/Exception.php +++ b/library/Icinga/Protocol/Ldap/Exception.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Ldap/LdapUtils.php b/library/Icinga/Protocol/Ldap/LdapUtils.php index 2271a6b57..297d28c4a 100644 --- a/library/Icinga/Protocol/Ldap/LdapUtils.php +++ b/library/Icinga/Protocol/Ldap/LdapUtils.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Ldap/Node.php b/library/Icinga/Protocol/Ldap/Node.php index 44c5b1fb1..d178cb28b 100644 --- a/library/Icinga/Protocol/Ldap/Node.php +++ b/library/Icinga/Protocol/Ldap/Node.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Ldap/Root.php b/library/Icinga/Protocol/Ldap/Root.php index 215d3bfb5..7ea40b005 100644 --- a/library/Icinga/Protocol/Ldap/Root.php +++ b/library/Icinga/Protocol/Ldap/Root.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Livestatus/Connection.php b/library/Icinga/Protocol/Livestatus/Connection.php index eeec86c01..395d21442 100755 --- a/library/Icinga/Protocol/Livestatus/Connection.php +++ b/library/Icinga/Protocol/Livestatus/Connection.php @@ -141,7 +141,7 @@ class Connection ); } Benchmark::measure('Data sorted, limits applied'); - + return $result; } @@ -166,7 +166,7 @@ class Connection if ($result === null) { throw new Exception('Got invalid response body from livestatus'); } - + return $result; } @@ -174,7 +174,7 @@ class Connection { $offset = 0; $buffer = ''; - + while ($offset < $length) { $data = socket_read($this->connection, $length - $offset); if ($data === false) { @@ -188,7 +188,7 @@ class Connection $size = strlen($data); $offset += $size; $buffer .= $data; - + if ($size === 0) { break; } @@ -245,7 +245,7 @@ class Connection if (! defined('TCP_NODELAY')) { define('TCP_NODELAY', 1); } - + $this->connection = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); if (! @socket_connect($this->connection, $this->socket_host, $this->socket_port)) { throw new \Exception( diff --git a/library/Icinga/Protocol/Nrpe/Packet.php b/library/Icinga/Protocol/Nrpe/Packet.php index 65cde2f04..6960aa0f0 100644 --- a/library/Icinga/Protocol/Nrpe/Packet.php +++ b/library/Icinga/Protocol/Nrpe/Packet.php @@ -6,7 +6,7 @@ class Packet { const QUERY = 0x01; const RESPONSE = 0x02; - + protected $version = 0x02; protected $type; protected $body; diff --git a/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php b/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php index 24f69b040..f3fe4453f 100755 --- a/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php +++ b/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/IReader.php b/library/Icinga/Protocol/Statusdat/IReader.php index 62c2f9702..4dae2e929 100755 --- a/library/Icinga/Protocol/Statusdat/IReader.php +++ b/library/Icinga/Protocol/Statusdat/IReader.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/ObjectContainer.php b/library/Icinga/Protocol/Statusdat/ObjectContainer.php index 42b1b6cdb..384b0211e 100644 --- a/library/Icinga/Protocol/Statusdat/ObjectContainer.php +++ b/library/Icinga/Protocol/Statusdat/ObjectContainer.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/Query.php b/library/Icinga/Protocol/Statusdat/Query.php index fa913ff5d..672a722a8 100755 --- a/library/Icinga/Protocol/Statusdat/Query.php +++ b/library/Icinga/Protocol/Statusdat/Query.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/Query/Expression.php b/library/Icinga/Protocol/Statusdat/Query/Expression.php index 011fd5d6e..a7a7e9961 100755 --- a/library/Icinga/Protocol/Statusdat/Query/Expression.php +++ b/library/Icinga/Protocol/Statusdat/Query/Expression.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/Query/Group.php b/library/Icinga/Protocol/Statusdat/Query/Group.php index 5afca8bfb..2fc40c42f 100755 --- a/library/Icinga/Protocol/Statusdat/Query/Group.php +++ b/library/Icinga/Protocol/Statusdat/Query/Group.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php b/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php index d17b38024..bf8b19ba3 100755 --- a/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php +++ b/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/Reader.php b/library/Icinga/Protocol/Statusdat/Reader.php index 4a266e131..22b7bc953 100755 --- a/library/Icinga/Protocol/Statusdat/Reader.php +++ b/library/Icinga/Protocol/Statusdat/Reader.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php b/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php index fe3321dbd..178cf1f55 100755 --- a/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php +++ b/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php b/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php index db3082b5f..dde5c7aba 100644 --- a/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php +++ b/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php b/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php index 5c2f218c7..9bf98362c 100755 --- a/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php +++ b/library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Controller/BaseConfigController.php b/library/Icinga/Web/Controller/BaseConfigController.php index a3b8a7fe2..eed1cf536 100644 --- a/library/Icinga/Web/Controller/BaseConfigController.php +++ b/library/Icinga/Web/Controller/BaseConfigController.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Controller/BasePreferenceController.php b/library/Icinga/Web/Controller/BasePreferenceController.php index 94293655a..59626b453 100644 --- a/library/Icinga/Web/Controller/BasePreferenceController.php +++ b/library/Icinga/Web/Controller/BasePreferenceController.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Controller/ControllerTabCollector.php b/library/Icinga/Web/Controller/ControllerTabCollector.php index d5d48fa4c..471f1cceb 100644 --- a/library/Icinga/Web/Controller/ControllerTabCollector.php +++ b/library/Icinga/Web/Controller/ControllerTabCollector.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php b/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php index 07558e1e7..0dc28ea57 100644 --- a/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php +++ b/library/Icinga/Web/Hook/Configuration/ConfigurationTab.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php b/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php index d74118750..f548b355b 100644 --- a/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php +++ b/library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php b/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php index 25a19b11d..fb152fb49 100644 --- a/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php +++ b/library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Hook/Toptray.php b/library/Icinga/Web/Hook/Toptray.php index 52a6f9e3c..f0c937848 100755 --- a/library/Icinga/Web/Hook/Toptray.php +++ b/library/Icinga/Web/Hook/Toptray.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php index 0ec9c49f1..805f732b8 100644 --- a/library/Icinga/Web/Notification.php +++ b/library/Icinga/Web/Notification.php @@ -3,21 +3,21 @@ /** * Icinga 2 Web - Head for multiple monitoring frontends * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @author Icinga Development Team */ diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php index 5362c9723..753418a3c 100755 --- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php +++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team @@ -36,7 +36,7 @@ class QueryAdapter implements \Zend_Paginator_Adapter_Interface { /** * Array - * + * * @var array */ protected $query = null; @@ -50,7 +50,7 @@ class QueryAdapter implements \Zend_Paginator_Adapter_Interface /** * Constructor. - * + * * @param array $query Query to paginate */ // TODO: Re-add abstract Query type as soon as a more generic one diff --git a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php index c74cf0822..03a7179c0 100755 --- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php +++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php @@ -4,24 +4,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/library/Icinga/Web/Widget/Dashboard/Pane.php b/library/Icinga/Web/Widget/Dashboard/Pane.php index a5ada7056..19b70a6a1 100644 --- a/library/Icinga/Web/Widget/Dashboard/Pane.php +++ b/library/Icinga/Web/Widget/Dashboard/Pane.php @@ -173,7 +173,7 @@ class Pane implements Widget /** * Add a component to this pane, optionally creating it if $component is a string * - * @param string|Component $component The component object or title + * @param string|Component $component The component object or title * (if a new component will be created) * @param string|null $url An Url to be used when component is a string * diff --git a/library/vendor/Michelf/Markdown.php b/library/vendor/Michelf/Markdown.php index 8072d722f..697c67c3f 100644 --- a/library/vendor/Michelf/Markdown.php +++ b/library/vendor/Michelf/Markdown.php @@ -2,12 +2,12 @@ # # Markdown - A text-to-HTML conversion tool for web writers # -# PHP Markdown -# Copyright (c) 2004-2013 Michel Fortin +# PHP Markdown +# Copyright (c) 2004-2013 Michel Fortin # # -# Original Markdown -# Copyright (c) 2004-2006 John Gruber +# Original Markdown +# Copyright (c) 2004-2006 John Gruber # # namespace Michelf; @@ -50,11 +50,11 @@ class Markdown { # Change to ">" for HTML output. public $empty_element_suffix = " />"; public $tab_width = 4; - + # Change to `true` to disallow markup or entities. public $no_markup = false; public $no_entities = false; - + # Predefined urls and titles for reference links and images. public $predef_urls = array(); public $predef_titles = array(); @@ -66,7 +66,7 @@ class Markdown { # Needed to insert a maximum bracked depth while converting to PHP. protected $nested_brackets_depth = 6; protected $nested_brackets_re; - + protected $nested_url_parenthesis_depth = 4; protected $nested_url_parenthesis_re; @@ -81,17 +81,17 @@ class Markdown { # $this->_initDetab(); $this->prepareItalicsAndBold(); - - $this->nested_brackets_re = + + $this->nested_brackets_re = str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth). str_repeat('\])*', $this->nested_brackets_depth); - - $this->nested_url_parenthesis_re = + + $this->nested_url_parenthesis_re = str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth). str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth); - + $this->escape_chars_re = '['.preg_quote($this->escape_chars).']'; - + # Sort document, block, and span gamut in ascendent priority order. asort($this->document_gamut); asort($this->block_gamut); @@ -103,27 +103,27 @@ class Markdown { protected $urls = array(); protected $titles = array(); protected $html_hashes = array(); - + # Status flag to avoid invalid nesting. protected $in_anchor = false; - - + + protected function setup() { # - # Called before the transformation process starts to setup parser + # Called before the transformation process starts to setup parser # states. # # Clear global hashes. $this->urls = $this->predef_urls; $this->titles = $this->predef_titles; $this->html_hashes = array(); - + $this->in_anchor = false; } - + protected function teardown() { # - # Called after the transformation process to clear any variable + # Called after the transformation process to clear any variable # which may be taking up memory unnecessarly. # $this->urls = array(); @@ -138,7 +138,7 @@ class Markdown { # and pass it through the document gamut. # $this->setup(); - + # Remove UTF-8 BOM and marker character in input, if present. $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text); @@ -165,16 +165,16 @@ class Markdown { foreach ($this->document_gamut as $method => $priority) { $text = $this->$method($text); } - + $this->teardown(); return $text . "\n"; } - + protected $document_gamut = array( # Strip link definitions, store in hashes. "stripLinkDefinitions" => 20, - + "runBasicBlockGamut" => 30, ); @@ -235,8 +235,8 @@ class Markdown { # hard-coded: # # * List "a" is made of tags which can be both inline or block-level. - # These will be treated block-level when the start tag is alone on - # its line, otherwise they're not matched here and will be taken as + # These will be treated block-level when the start tag is alone on + # its line, otherwise they're not matched here and will be taken as # inline later. # * List "b" is made of tags which are always block-level; # @@ -260,7 +260,7 @@ class Markdown { | \'[^\']*\' # text inside single quotes (tolerate ">") )* - )? + )? '; $content = str_repeat(' @@ -277,7 +277,7 @@ class Markdown { str_repeat(' # closing nested tag ) - | + | <(?!/\2\s*> # other tags with a different name ) )*', @@ -303,9 +303,9 @@ class Markdown { ) ( # save in $1 - # Match from `\n` to `\n`, handling nested tags + # Match from `\n` to `\n`, handling nested tags # in between. - + [ ]{0,'.$less_than_tab.'} <('.$block_tags_b_re.')# start tag = $2 '.$attr.'> # attributes followed by > and \n @@ -323,28 +323,28 @@ class Markdown { # the matching end tag [ ]* # trailing spaces/tabs (?=\n+|\Z) # followed by a newline or end of document - - | # Special case just for
. It was easier to make a special + + | # Special case just for
. It was easier to make a special # case than to make the other regex more complicated. - + [ ]{0,'.$less_than_tab.'} <(hr) # start tag = $2 '.$attr.' # attributes /?> # the matching end tag [ ]* (?=\n{2,}|\Z) # followed by a blank line or end of document - + | # Special case for standalone HTML comments: - + [ ]{0,'.$less_than_tab.'} (?s: ) [ ]* (?=\n{2,}|\Z) # followed by a blank line or end of document - + | # PHP and ASP-style processor instructions (hashBlock($text); return "\n\n$key\n\n"; } - - + + protected function hashPart($text, $boundary = 'X') { # - # Called whenever a tag must be hashed when a function insert an atomic + # Called whenever a tag must be hashed when a function insert an atomic # element in the text stream. Passing $text to through this function gives # a unique text-token which will be reverted back when calling unhash. # @@ -382,7 +382,7 @@ class Markdown { # Swap back any tag hash found in $text so we do not have to `unhash` # multiple times at the end. $text = $this->unhash($text); - + # Then hash the block. static $i = 0; $key = "$boundary\x1A" . ++$i . $boundary; @@ -406,7 +406,7 @@ class Markdown { # "doHeaders" => 10, "doHorizontalRules" => 20, - + "doLists" => 40, "doCodeBlocks" => 50, "doBlockQuotes" => 60, @@ -416,33 +416,33 @@ class Markdown { # # Run block gamut tranformations. # - # We need to escape raw HTML in Markdown source before doing anything - # else. This need to be done for each block, and not only at the + # We need to escape raw HTML in Markdown source before doing anything + # else. This need to be done for each block, and not only at the # begining in the Markdown function since hashed blocks can be part of - # list items and could have been indented. Indented blocks would have + # list items and could have been indented. Indented blocks would have # been seen as a code block in a previous pass of hashHTMLBlocks. $text = $this->hashHTMLBlocks($text); - + return $this->runBasicBlockGamut($text); } - + protected function runBasicBlockGamut($text) { # - # Run block gamut tranformations, without hashing HTML blocks. This is + # Run block gamut tranformations, without hashing HTML blocks. This is # useful when HTML blocks are known to be already hashed, like in the first # whole-document pass. # foreach ($this->block_gamut as $method => $priority) { $text = $this->$method($text); } - + # Finally form paragraph and restore hashed blocks. $text = $this->formParagraphs($text); return $text; } - - + + protected function doHorizontalRules($text) { # Do Horizontal Rules: return preg_replace( @@ -456,7 +456,7 @@ class Markdown { [ ]* # Tailing spaces $ # End of line. }mx', - "\n".$this->hashBlock("empty_element_suffix")."\n", + "\n".$this->hashBlock("empty_element_suffix")."\n", $text); } @@ -474,7 +474,7 @@ class Markdown { # because ![foo][f] looks like an anchor. "doImages" => 10, "doAnchors" => 20, - + # Make links out of things like `` # Must come after doAnchors, because you can use < and > # delimiters in inline links like [this](). @@ -495,11 +495,11 @@ class Markdown { return $text; } - - + + protected function doHardBreaks($text) { # Do hard breaks: - return preg_replace_callback('/ {2,}\n/', + return preg_replace_callback('/ {2,}\n/', array(&$this, '_doHardBreaks_callback'), $text); } protected function _doHardBreaks_callback($matches) { @@ -513,7 +513,7 @@ class Markdown { # if ($this->in_anchor) return $text; $this->in_anchor = true; - + # # First, handle reference-style links: [link text] [id] # @@ -586,7 +586,7 @@ class Markdown { # for shortcut links like [this][] or [this]. $link_id = $link_text; } - + # lower-case and turn embedded newlines into spaces $link_id = strtolower($link_id); $link_id = preg_replace('{[ ]?\n}', ' ', $link_id); @@ -594,14 +594,14 @@ class Markdown { if (isset($this->urls[$link_id])) { $url = $this->urls[$link_id]; $url = $this->encodeAttribute($url); - + $result = "titles[$link_id] ) ) { $title = $this->titles[$link_id]; $title = $this->encodeAttribute($title); $result .= " title=\"$title\""; } - + $link_text = $this->runSpanGamut($link_text); $result .= ">$link_text"; $result = $this->hashPart($result); @@ -624,7 +624,7 @@ class Markdown { $title = $this->encodeAttribute($title); $result .= " title=\"$title\""; } - + $link_text = $this->runSpanGamut($link_text); $result .= ">$link_text"; @@ -653,7 +653,7 @@ class Markdown { \] ) - }xs', + }xs', array(&$this, '_doImages_reference_callback'), $text); # @@ -738,7 +738,7 @@ class Markdown { # Setext-style headers: # Header 1 # ======== - # + # # Header 2 # -------- # @@ -768,7 +768,7 @@ class Markdown { # Terrible hack to check we haven't found an empty list item. if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) return $matches[0]; - + $level = $matches[2]{0} == '=' ? 1 : 2; $block = "".$this->runSpanGamut($matches[1]).""; return "\n" . $this->hashBlock($block) . "\n\n"; @@ -824,10 +824,10 @@ class Markdown { ) ) '; // mx - + # We use a different prefix before nested lists than top-level lists. # See extended comment in _ProcessListItems(). - + if ($this->list_level) { $text = preg_replace_callback('{ ^ @@ -851,15 +851,15 @@ class Markdown { $marker_ul_re = '[*+-]'; $marker_ol_re = '\d+[\.]'; $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)"; - + $list = $matches[1]; $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol"; - + $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re ); - + $list .= "\n"; $result = $this->processListItems($list, $marker_any_re); - + $result = $this->hashBlock("<$list_type>\n" . $result . ""); return "\n". $result ."\n\n"; } @@ -891,7 +891,7 @@ class Markdown { # without resorting to mind-reading. Perhaps the solution is to # change the syntax rules such that sub-lists must start with a # starting cardinal number; e.g. "1." or "a.". - + $this->list_level++; # trim trailing blank lines: @@ -919,7 +919,7 @@ class Markdown { $marker_space = $matches[3]; $tailing_blank_line =& $matches[5]; - if ($leading_line || $tailing_blank_line || + if ($leading_line || $tailing_blank_line || preg_match('/\n{2,}/', $item)) { # Replace marker with the appropriate whitespace indentation @@ -994,7 +994,7 @@ class Markdown { '___' => '(?<=\S|^)(?em_strong_prepared_relist["$em$strong"] = $token_re; } } } - + protected function doItalicsAndBold($text) { $token_stack = array(''); $text_stack = array(''); $em = ''; $strong = ''; $tree_char_em = false; - + while (1) { # # Get prepared regular expression for seraching emphasis tokens # in current context. # $token_re = $this->em_strong_prepared_relist["$em$strong"]; - + # - # Each loop iteration search for the next emphasis token. + # Each loop iteration search for the next emphasis token. # Each token is then passed to handleSpanToken. # $parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE); $text_stack[0] .= $parts[0]; $token =& $parts[1]; $text =& $parts[2]; - + if (empty($token)) { # Reached end of text span: empty stack without emitting. # any more emphasis. @@ -1049,7 +1049,7 @@ class Markdown { } break; } - + $token_len = strlen($token); if ($tree_char_em) { # Reached closing marker while inside a three-char emphasis. @@ -1088,7 +1088,7 @@ class Markdown { $$tag = ''; # $$tag stands for $em or $strong } } else { - # Reached opening three-char emphasis marker. Push on token + # Reached opening three-char emphasis marker. Push on token # stack; will be handled by the special condition above. $em = $token{0}; $strong = "$em$em"; @@ -1162,9 +1162,9 @@ class Markdown { $bq = $this->runBlockGamut($bq); # recurse $bq = preg_replace('/^/m', " ", $bq); - # These leading spaces cause problem with
 content, 
+		# These leading spaces cause problem with 
 content,
 		# so we need to fix that:
-		$bq = preg_replace_callback('{(\s*
.+?
)}sx', + $bq = preg_replace_callback('{(\s*
.+?
)}sx', array(&$this, '_doBlockQuotes_callback2'), $bq); return "\n". $this->hashBlock("
\n$bq\n
")."\n\n"; @@ -1227,7 +1227,7 @@ class Markdown { // # We can't call Markdown(), because that resets the hash; // # that initialization code should be pulled into its own sub, though. // $div_content = $this->hashHTMLBlocks($div_content); -// +// // # Run document gamut methods on the content. // foreach ($this->document_gamut as $method => $priority) { // $div_content = $this->$method($div_content); @@ -1255,11 +1255,11 @@ class Markdown { $text = str_replace('"', '"', $text); return $text; } - - + + protected function encodeAmpsAndAngles($text) { # - # Smart processing for ampersands and angle brackets that need to + # Smart processing for ampersands and angle brackets that need to # be encoded. Valid character entities are left alone unless the # no-entities mode is set. # @@ -1268,7 +1268,7 @@ class Markdown { } else { # Ampersand-encoding based entirely on Nat Irons's Amputator # MT plugin: - $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', + $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', '&', $text);; } # Encode remaining <'s @@ -1279,7 +1279,7 @@ class Markdown { protected function doAutoLinks($text) { - $text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', + $text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', array(&$this, '_doAutoLinks_url_callback'), $text); # Email addresses: @@ -1336,7 +1336,7 @@ class Markdown { $addr = "mailto:" . $addr; $chars = preg_split('/(? $char) { $ord = ord($char); # Ignore non-ascii chars. @@ -1349,7 +1349,7 @@ class Markdown { else $chars[$key] = '&#'.$ord.';'; } } - + $addr = implode('', $chars); $text = implode('', array_slice($chars, 7)); # text without `mailto:` $addr = "$text"; @@ -1364,7 +1364,7 @@ class Markdown { # escaped characters and handling code spans. # $output = ''; - + $span_re = '{ ( \\\\'.$this->escape_chars_re.' @@ -1393,17 +1393,17 @@ class Markdown { while (1) { # - # Each loop iteration seach for either the next tag, the next - # openning code span marker, or the next escaped character. + # Each loop iteration seach for either the next tag, the next + # openning code span marker, or the next escaped character. # Each token is then passed to handleSpanToken. # $parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE); - + # Create token from text preceding tag. if ($parts[0] != "") { $output .= $parts[0]; } - + # Check if we reach the end. if (isset($parts[1])) { $output .= $this->handleSpanToken($parts[1], $parts[2]); @@ -1413,14 +1413,14 @@ class Markdown { break; } } - + return $output; } - - + + protected function handleSpanToken($token, &$str) { # - # Handle $token provided by parseSpan by determining its nature and + # Handle $token provided by parseSpan by determining its nature and # returning the corresponding value that should replace it. # switch ($token{0}) { @@ -1428,7 +1428,7 @@ class Markdown { return $this->hashPart("&#". ord($token{1}). ";"); case "`": # Search for end marker in remaining text. - if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', + if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', $str, $matches)) { $str = $matches[2]; @@ -1450,18 +1450,18 @@ class Markdown { } - # String length function for detab. `_initDetab` will create a function to + # String length function for detab. `_initDetab` will create a function to # hanlde UTF-8 if the default function does not exist. protected $utf8_strlen = 'mb_strlen'; - + protected function detab($text) { # # Replace tabs with the appropriate amount of space. # # For each line we separate the line in blocks delemited by - # tab characters. Then we reconstruct every line by adding the + # tab characters. Then we reconstruct every line by adding the # appropriate number of space between each blocks. - + $text = preg_replace_callback('/^.*\t.*$/m', array(&$this, '_detab_callback'), $text); @@ -1470,7 +1470,7 @@ class Markdown { protected function _detab_callback($matches) { $line = $matches[0]; $strlen = $this->utf8_strlen; # strlen function for UTF-8. - + # Split in blocks. $blocks = explode("\t", $line); # Add each blocks to the line. @@ -1478,7 +1478,7 @@ class Markdown { unset($blocks[0]); # Do not add first block twice. foreach ($blocks as $block) { # Calculate amount of space, insert spaces, insert block. - $amount = $this->tab_width - + $amount = $this->tab_width - $strlen($line, 'UTF-8') % $this->tab_width; $line .= str_repeat(" ", $amount) . $block; } @@ -1487,13 +1487,13 @@ class Markdown { protected function _initDetab() { # # Check for the availability of the function in the `utf8_strlen` property - # (initially `mb_strlen`). If the function is not available, create a + # (initially `mb_strlen`). If the function is not available, create a # function that will loosely count the number of UTF-8 characters with a # regular expression. # if (function_exists($this->utf8_strlen)) return; $this->utf8_strlen = create_function('$text', 'return preg_match_all( - "/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", + "/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", $text, $m);'); } @@ -1502,7 +1502,7 @@ class Markdown { # # Swap back in all the tags hashed by _HashHTMLBlocks. # - return preg_replace_callback('/(.)\x1A[0-9]+\1/', + return preg_replace_callback('/(.)\x1A[0-9]+\1/', array(&$this, '_unhash_callback'), $text); } protected function _unhash_callback($matches) { @@ -1530,11 +1530,11 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Prefix for footnote ids. public $fn_id_prefix = ""; - + # Optional title attribute for footnote links and backlinks. public $fn_link_title = ""; public $fn_backlink_title = ""; - + # Optional class attribute for footnote links and backlinks. public $fn_link_class = "footnote-ref"; public $fn_backlink_class = "footnote-backref"; @@ -1549,7 +1549,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Class attribute for code blocks goes on the `code` tag; # setting this to true will put attributes on the `pre` tag instead. public $code_attr_on_pre = false; - + # Predefined abbreviations. public $predef_abbr = array(); @@ -1560,11 +1560,11 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # # Constructor function. Initialize the parser object. # - # Add extra escapable characters before parent constructor + # Add extra escapable characters before parent constructor # initialize the table. $this->escape_chars .= ':|'; - - # Insert extra document, block, and span transformations. + + # Insert extra document, block, and span transformations. # Parent constructor will do the sorting. $this->document_gamut += array( "doFencedCodeBlocks" => 5, @@ -1581,11 +1581,11 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { "doFootnotes" => 5, "doAbbreviations" => 70, ); - + parent::__construct(); } - - + + # Extra variables used during extra transformations. protected $footnotes = array(); protected $footnotes_ordered = array(); @@ -1593,17 +1593,17 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { protected $footnotes_numbers = array(); protected $abbr_desciptions = array(); protected $abbr_word_re = ''; - + # Give the current footnote number. protected $footnote_counter = 1; - - + + protected function setup() { # # Setting up Extra-specific variables. # parent::setup(); - + $this->footnotes = array(); $this->footnotes_ordered = array(); $this->footnotes_ref_count = array(); @@ -1611,7 +1611,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $this->abbr_desciptions = array(); $this->abbr_word_re = ''; $this->footnote_counter = 1; - + foreach ($this->predef_abbr as $abbr_word => $abbr_desc) { if ($this->abbr_word_re) $this->abbr_word_re .= '|'; @@ -1619,7 +1619,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); } } - + protected function teardown() { # # Clearing Extra-specific variables. @@ -1630,11 +1630,11 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $this->footnotes_numbers = array(); $this->abbr_desciptions = array(); $this->abbr_word_re = ''; - + parent::teardown(); } - - + + ### Extra Attribute Parser ### # Expression to use to catch attributes (includes the braces) @@ -1650,7 +1650,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Currently supported attributes are .class and #id. # if (empty($attr)) return ""; - + # Split on components preg_match_all('/[#.][-_:a-zA-Z0-9]+/', $attr, $matches); $elements = $matches[0]; @@ -1724,23 +1724,23 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { ### HTML Block Parser ### - + # Tags that are always treated as block tags: protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption'; - + # Tags treated as block tags only if the opening tag is alone on its line: protected $context_block_tags_re = 'script|noscript|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video'; - + # Tags where markdown="1" default to span mode: protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address'; - - # Tags which must not have their contents modified, no matter where + + # Tags which must not have their contents modified, no matter where # they appear: protected $clean_tags_re = 'script|math|svg'; - + # Tags that do not need to be closed. protected $auto_close_tags_re = 'hr|img|param|source|track'; - + protected function hashHTMLBlocks($text) { # @@ -1753,7 +1753,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # hard-coded. # # This works by calling _HashHTMLBlocks_InMarkdown, which then calls - # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" + # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" # attribute is found within a tag, _HashHTMLBlocks_InHTML calls back # _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag. # These two functions are calling each other. It's recursive! @@ -1764,7 +1764,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Call the HTML-in-Markdown hasher. # list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text); - + return $text; } protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0, @@ -1773,8 +1773,8 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags. # - # * $indent is the number of space to be ignored when checking for code - # blocks. This is important because if we don't take the indent into + # * $indent is the number of space to be ignored when checking for code + # blocks. This is important because if we don't take the indent into # account, something like this (which looks right) won't work as expected: # #
@@ -1786,11 +1786,11 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # If you don't like this, just don't indent the tag on which # you apply the markdown="1" attribute. # - # * If $enclosing_tag_re is not empty, stops at the first unmatched closing + # * If $enclosing_tag_re is not empty, stops at the first unmatched closing # tag with that name. Nested tags supported. # - # * If $span is true, text inside must treated as span. So any double - # newline will be replaced by a single newline so that it does not create + # * If $span is true, text inside must treated as span. So any double + # newline will be replaced by a single newline so that it does not create # paragraphs. # # Returns an array of that form: ( processed text , remaining text ) @@ -1799,13 +1799,13 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Regex to check for the presense of newlines around a block tag. $newline_before_re = '/(?:^\n?|\n\n)*$/'; - $newline_after_re = + $newline_after_re = '{ ^ # Start of text following the tag. (?>[ ]*)? # Optional comment. [ ]*\n # Must be followed by newline. }xs'; - + # Regex to match any tag. $block_tag_re = '{ @@ -1859,7 +1859,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { ) }xs'; - + $depth = 0; # Current depth inside the tag tree. $parsed = ""; # Parsed text that will be returned. @@ -1871,32 +1871,32 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # # Split the text using the first $tag_match pattern found. # Text before pattern will be first in the array, text after - # pattern will be at the end, and between will be any catches made + # pattern will be at the end, and between will be any catches made # by the pattern. # - $parts = preg_split($block_tag_re, $text, 2, + $parts = preg_split($block_tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE); - - # If in Markdown span mode, add a empty-string span-level hash + + # If in Markdown span mode, add a empty-string span-level hash # after each newline to prevent triggering any block element. if ($span) { $void = $this->hashPart("", ':'); $newline = "$void\n"; $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void; } - + $parsed .= $parts[0]; # Text before current tag. - + # If end of $text has been reached. Stop loop. if (count($parts) < 3) { $text = ""; break; } - + $tag = $parts[1]; # Tag to handle. $text = $parts[2]; # Remaining text after current tag. $tag_re = preg_quote($tag); # For use in a regular expression. - + # # Check for: Code span marker # @@ -1923,7 +1923,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $fence_indent = strlen($capture[1]); # use captured indent in re $fence_re = $capture[2]; # use captured fence in re if (preg_match('{^(?>.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text, - $matches)) + $matches)) { # End marker found: pass text unchanged until marker. $parsed .= $tag . $matches[0]; @@ -1938,13 +1938,13 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Check for: Indented code block. # else if ($tag{0} == "\n" || $tag{0} == " ") { - # Indented code block: pass it unchanged, will be handled + # Indented code block: pass it unchanged, will be handled # later. $parsed .= $tag; } # # Check for: Opening Block level tag or - # Opening Context Block tag (like ins and del) + # Opening Context Block tag (like ins and del) # used as a block tag (tag is alone on it's line). # else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) || @@ -1954,9 +1954,9 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { ) { # Need to parse tag and following text using the HTML parser. - list($block_text, $text) = + list($block_text, $text) = $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true); - + # Make sure it stays outside of any paragraph by adding newlines. $parsed .= "\n\n$block_text\n\n"; } @@ -1969,9 +1969,9 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { { # Need to parse tag and following text using the HTML parser. # (don't check for markdown attribute) - list($block_text, $text) = + list($block_text, $text) = $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false); - + $parsed .= $block_text; } # @@ -1995,14 +1995,14 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $text = $tag . $text; break; } - + $parsed .= $tag; } else { $parsed .= $tag; } } while ($depth >= 0); - + return array($parsed, $text); } protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) { @@ -2017,7 +2017,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Returns an array of that form: ( processed text , remaining text ) # if ($text === '') return array('', ''); - + # Regex to match `markdown` attribute inside of a tag. $markdown_attr_re = ' { @@ -2025,15 +2025,15 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { markdown \s*=\s* (?> - (["\']) # $1: quote delimiter + (["\']) # $1: quote delimiter (.*?) # $2: attribute value - \1 # matching delimiter + \1 # matching delimiter | ([^\s>]*) # $3: unquoted attribute value ) () # $4: make $3 always defined (avoid warnings) }xs'; - + # Regex to match any tag. $tag_re = '{ ( # $2: Capture whole tag. @@ -2056,9 +2056,9 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # CData Block ) }xs'; - + $original_text = $text; # Save original text in case of faliure. - + $depth = 0; # Current depth inside the tag tree. $block_text = ""; # Temporary text holder for current text. $parsed = ""; # Parsed text that will be returned. @@ -2077,25 +2077,25 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # # Split the text using the first $tag_match pattern found. # Text before pattern will be first in the array, text after - # pattern will be at the end, and between will be any catches made + # pattern will be at the end, and between will be any catches made # by the pattern. # $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE); - + if (count($parts) < 3) { # # End of $text reached with unbalenced tag(s). # In that case, we return original text unchanged and pass the - # first character as filtered to prevent an infinite loop in the + # first character as filtered to prevent an infinite loop in the # parent function. # return array($original_text{0}, substr($original_text, 1)); } - + $block_text .= $parts[0]; # Text before current tag. $tag = $parts[1]; # Tag to handle. $text = $parts[2]; # Remaining text after current tag. - + # # Check for: Auto-close tag (like
) # Comments and Processing Instructions. @@ -2115,22 +2115,22 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { if ($tag{1} == '/') $depth--; else if ($tag{strlen($tag)-2} != '/') $depth++; } - + # # Check for `markdown="1"` attribute and handle it. # - if ($md_attr && + if ($md_attr && preg_match($markdown_attr_re, $tag, $attr_m) && preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3])) { # Remove `markdown` attribute from opening tag. $tag = preg_replace($markdown_attr_re, '', $tag); - + # Check if text inside this tag must be parsed in span mode. $this->mode = $attr_m[2] . $attr_m[3]; $span_mode = $this->mode == 'span' || $this->mode != 'block' && preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag); - + # Calculate indent before tag. if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) { $strlen = $this->utf8_strlen; @@ -2138,44 +2138,44 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { } else { $indent = 0; } - + # End preceding block with this tag. $block_text .= $tag; $parsed .= $this->$hash_method($block_text); - + # Get enclosing tag name for the ParseMarkdown function. # (This pattern makes $tag_name_re safe without quoting.) preg_match('/^<([\w:$]*)\b/', $tag, $matches); $tag_name_re = $matches[1]; - + # Parse the content using the HTML-in-Markdown parser. list ($block_text, $text) - = $this->_hashHTMLBlocks_inMarkdown($text, $indent, + = $this->_hashHTMLBlocks_inMarkdown($text, $indent, $tag_name_re, $span_mode); - + # Outdent markdown text. if ($indent > 0) { - $block_text = preg_replace("/^[ ]{1,$indent}/m", "", + $block_text = preg_replace("/^[ ]{1,$indent}/m", "", $block_text); } - + # Append tag content to parsed text. if (!$span_mode) $parsed .= "\n\n$block_text\n\n"; else $parsed .= "$block_text"; - + # Start over with a new block. $block_text = ""; } else $block_text .= $tag; } - + } while ($depth > 0); - + # # Hash last block text that wasn't processed inside the loop. # $parsed .= $this->$hash_method($block_text); - + return array($parsed, $text); } @@ -2183,7 +2183,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { protected function hashClean($text) { # # Called whenever a tag must be hashed when a function inserts a "clean" tag - # in $text, it passes through this function and is automaticaly escaped, + # in $text, it passes through this function and is automaticaly escaped, # blocking invalid nested overlap. # return $this->hashPart($text, 'C'); @@ -2196,7 +2196,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # if ($this->in_anchor) return $text; $this->in_anchor = true; - + # # First, handle reference-style links: [link text] [id] # @@ -2270,7 +2270,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # for shortcut links like [this][] or [this]. $link_id = $link_text; } - + # lower-case and turn embedded newlines into spaces $link_id = strtolower($link_id); $link_id = preg_replace('{[ ]?\n}', ' ', $link_id); @@ -2278,7 +2278,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { if (isset($this->urls[$link_id])) { $url = $this->urls[$link_id]; $url = $this->encodeAttribute($url); - + $result = "titles[$link_id] ) ) { $title = $this->titles[$link_id]; @@ -2287,7 +2287,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { } if (isset($this->ref_attr[$link_id])) $result .= $this->ref_attr[$link_id]; - + $link_text = $this->runSpanGamut($link_text); $result .= ">$link_text"; $result = $this->hashPart($result); @@ -2313,7 +2313,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $result .= " title=\"$title\""; } $result .= $attr; - + $link_text = $this->runSpanGamut($link_text); $result .= ">$link_text"; @@ -2342,7 +2342,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { \] ) - }xs', + }xs', array(&$this, '_doImages_reference_callback'), $text); # @@ -2435,7 +2435,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Setext-style headers: # Header 1 {#header1} # ======== - # + # # Header 2 {#header2 .class1 .class2} # -------- # @@ -2503,10 +2503,10 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { [ ]{0,'.$less_than_tab.'} # Allowed whitespace. [|] # Optional leading pipe (present) (.+) \n # $1: Header row (at least one pipe) - + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. [|] ([ ]*[-:]+[-| :]*) \n # $2: Header underline - + ( # $3: Cells (?> [ ]* # Allowed whitespace. @@ -2516,7 +2516,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { (?=\n|\Z) # Stop at final double newline. }xm', array(&$this, '_doTable_leadingPipe_callback'), $text); - + # # Find tables without leading pipe. # @@ -2530,10 +2530,10 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { ^ # Start of a line [ ]{0,'.$less_than_tab.'} # Allowed whitespace. (\S.*[|].*) \n # $1: Header row (at least one pipe) - + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. ([-:]+[ ]*[|][-| :]*) \n # $2: Header underline - + ( # $3: Cells (?> .* [|] .* \n # Row content @@ -2549,10 +2549,10 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $head = $matches[1]; $underline = $matches[2]; $content = $matches[3]; - + # Remove leading pipe for each row. $content = preg_replace('/^ *[|]/m', '', $content); - + return $this->_doTable_callback(array($matches[0], $head, $underline, $content)); } protected function _doTable_makeAlignAttr($alignname) @@ -2572,7 +2572,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $head = preg_replace('/[|] *$/m', '', $head); $underline = preg_replace('/[|] *$/m', '', $underline); $content = preg_replace('/[|] *$/m', '', $content); - + # Reading alignement from header underline. $separators = preg_split('/ *[|] */', $underline); foreach ($separators as $n => $s) { @@ -2585,14 +2585,14 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { else $attr[$n] = ''; } - - # Parsing span elements, including code spans, character escapes, + + # Parsing span elements, including code spans, character escapes, # and inline HTML tags, so that pipes inside those gets ignored. $head = $this->parseSpan($head); $headers = preg_split('/ *[|] */', $head); $col_count = count($headers); $attr = array_pad($attr, $col_count, ''); - + # Write column headers. $text = "\n"; $text .= "\n"; @@ -2601,20 +2601,20 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $text .= " ".$this->runSpanGamut(trim($header))."\n"; $text .= "\n"; $text .= "\n"; - + # Split content by row. $rows = explode("\n", trim($content, "\n")); - + $text .= "\n"; foreach ($rows as $row) { - # Parsing span elements, including code spans, character escapes, + # Parsing span elements, including code spans, character escapes, # and inline HTML tags, so that pipes inside those gets ignored. $row = $this->parseSpan($row); - + # Split row by cell. $row_cells = preg_split('/ *[|] */', $row, $col_count); $row_cells = array_pad($row_cells, $col_count, ''); - + $text .= "\n"; foreach ($row_cells as $n => $cell) $text .= " ".$this->runSpanGamut(trim($cell))."\n"; @@ -2622,11 +2622,11 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { } $text .= "\n"; $text .= "
"; - + return $this->hashBlock($text) . "\n"; } - + protected function doDefLists($text) { # # Form HTML definition lists. @@ -2672,7 +2672,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { protected function _doDefLists_callback($matches) { # Re-usable patterns to match list item bullets and number markers: $list = $matches[1]; - + # Turn double returns into triple returns, so that we can make a # paragraph for the last item in a list, if necessary: $result = trim($this->processDefListItems($list)); @@ -2687,7 +2687,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # into individual term and definition list items. # $less_than_tab = $this->tab_width - 1; - + # trim trailing blank lines: $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str); @@ -2698,9 +2698,9 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { [ ]{0,'.$less_than_tab.'} # leading whitespace (?!\:[ ]|[ ]) # negative lookahead for a definition # mark (colon) or more whitespace. - (?> \S.* \n)+? # actual term (not whitespace). - ) - (?=\n?[ ]{0,3}:[ ]) # lookahead for following line feed + (?> \S.* \n)+? # actual term (not whitespace). + ) + (?=\n?[ ]{0,3}:[ ]) # lookahead for following line feed # with a definition mark. }xm', array(&$this, '_processDefListItems_callback_dt'), $list_str); @@ -2717,8 +2717,8 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { (?: # next term or end of text [ ]{0,'.$less_than_tab.'} \:[ ] |
| \z - ) - ) + ) + ) }xm', array(&$this, '_processDefListItems_callback_dd'), $list_str); @@ -2762,7 +2762,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # ~~~ # $less_than_tab = $this->tab_width; - + $text = preg_replace_callback('{ (?:\n|\A) # 1: Opening marker @@ -2776,7 +2776,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { '.$this->id_class_attr_catch_re.' # 3: Extra attributes )? [ ]* \n # Whitespace and newline following marker. - + # 4: Content ( (?> @@ -2784,7 +2784,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { .*\n+ )+ ) - + # Closing marker. \1 [ ]* \n }xm', @@ -2810,11 +2810,11 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $pre_attr_str = $this->code_attr_on_pre ? $attr_str : ''; $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str; $codeblock = "$codeblock
"; - + return "\n\n".$this->hashBlock($codeblock)."\n\n"; } protected function _doFencedCodeBlocks_newlines($matches) { - return str_repeat("empty_element_suffix", + return str_repeat("empty_element_suffix", strlen($matches[0])); } @@ -2847,7 +2847,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # # Strip leading and trailing lines: $text = preg_replace('/\A\n+|\n+\z/', '', $text); - + $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY); # @@ -2855,29 +2855,29 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # foreach ($grafs as $key => $value) { $value = trim($this->runSpanGamut($value)); - + # Check if this should be enclosed in a paragraph. # Clean tag hashes & block tag hashes are left alone. $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value); - + if ($is_p) { $value = "

$value

"; } $grafs[$key] = $value; } - - # Join grafs in one text, then unhash HTML tags. + + # Join grafs in one text, then unhash HTML tags. $text = implode("\n\n", $grafs); - + # Finish by removing any tag hashes still present in $text. $text = $this->unhash($text); - + return $text; } - - + + ### Footnotes - + protected function stripFootnotes($text) { # # Strips link definitions from text, stores the URLs and titles in @@ -2891,15 +2891,15 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { [ ]* \n? # maybe *one* newline ( # text = $2 (no blank lines allowed) - (?: + (?: .+ # actual text | - \n # newlines but + \n # newlines but (?!\[\^.+?\]:\s)# negative lookahead for footnote marker. - (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed + (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed # by non-indented content )* - ) + ) }xm', array(&$this, '_stripFootnotes_callback'), $text); @@ -2914,7 +2914,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { protected function doFootnotes($text) { # - # Replace footnote references in $text [^id] with a special text-token + # Replace footnote references in $text [^id] with a special text-token # which will be replaced by the actual footnote marker in appendFootnotes. # if (!$this->in_anchor) { @@ -2923,20 +2923,20 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { return $text; } - + protected function appendFootnotes($text) { # # Append footnote list to text. # - $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', + $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', array(&$this, '_appendFootnotes_callback'), $text); - + if (!empty($this->footnotes_ordered)) { $text .= "\n\n"; $text .= "
\n"; $text .= "empty_element_suffix ."\n"; $text .= "
    \n\n"; - + $attr = " rev=\"footnote\""; if ($this->fn_backlink_class != "") { $class = $this->fn_backlink_class; @@ -2949,7 +2949,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $attr .= " title=\"$title\""; } $num = 0; - + while (!empty($this->footnotes_ordered)) { $footnote = reset($this->footnotes_ordered); $note_id = key($this->footnotes_ordered); @@ -2957,12 +2957,12 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $ref_count = $this->footnotes_ref_count[$note_id]; unset($this->footnotes_ref_count[$note_id]); unset($this->footnotes[$note_id]); - + $footnote .= "\n"; # Need to append newline before parsing. - $footnote = $this->runBlockGamut("$footnote\n"); - $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', + $footnote = $this->runBlockGamut("$footnote\n"); + $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', array(&$this, '_appendFootnotes_callback'), $footnote); - + $attr = str_replace("%%", ++$num, $attr); $note_id = $this->encodeAttribute($note_id); @@ -2977,12 +2977,12 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { } else { $footnote .= "\n\n

    $backlink

    "; } - + $text .= "
  1. \n"; $text .= $footnote . "\n"; $text .= "
  2. \n\n"; } - + $text .= "
\n"; $text .= "
"; } @@ -2990,7 +2990,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { } protected function _appendFootnotes_callback($matches) { $node_id = $this->fn_id_prefix . $matches[1]; - + # Create footnote marker only if it has a corresponding footnote *and* # the footnote hasn't been used by another marker. if (isset($this->footnotes[$node_id])) { @@ -3017,22 +3017,22 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $title = $this->encodeAttribute($title); $attr .= " title=\"$title\""; } - + $attr = str_replace("%%", $num, $attr); $node_id = $this->encodeAttribute($node_id); - + return "". "$num". ""; } - + return "[^".$matches[1]."]"; } - - + + ### Abbreviations ### - + protected function stripAbbreviations($text) { # # Strips abbreviations from text, stores titles in hash references. @@ -3042,7 +3042,7 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { # Link defs are in the form: [id]*: url "optional title" $text = preg_replace_callback('{ ^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?: # abbr_id = $1 - (.*) # text = $2 (no blank lines allowed) + (.*) # text = $2 (no blank lines allowed) }xm', array(&$this, '_stripAbbreviations_callback'), $text); @@ -3057,20 +3057,20 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); return ''; # String that will replace the block } - - + + protected function doAbbreviations($text) { # # Find defined abbreviations in text and wrap them in elements. # if ($this->abbr_word_re) { - // cannot use the /x modifier because abbr_word_re may + // cannot use the /x modifier because abbr_word_re may // contain significant spaces: $text = preg_replace_callback('{'. '(?abbr_word_re.')'. '(?![\w\x1A])'. - '}', + '}', array(&$this, '_doAbbreviations_callback'), $text); } return $text; diff --git a/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/AttrDef.php b/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/AttrDef.php index b2e4f36c5..25eb0ed3c 100644 --- a/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/AttrDef.php +++ b/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/AttrDef.php @@ -83,7 +83,7 @@ abstract class HTMLPurifier_AttrDef } /** - * Parses a possibly escaped CSS string and returns the "pure" + * Parses a possibly escaped CSS string and returns the "pure" * version of it. */ protected function expandCSSEscape($string) { diff --git a/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Lexer/PH5P.php b/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Lexer/PH5P.php index faf00b829..811732260 100644 --- a/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Lexer/PH5P.php +++ b/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Lexer/PH5P.php @@ -3,7 +3,7 @@ /** * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library. * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts. - * + * * @note * Recent changes to PHP's DOM extension have resulted in some fatal * error conditions with the original version of PH5P. Pending changes, @@ -11,7 +11,7 @@ */ class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex { - + public function tokenizeHTML($html, $config, $context) { $new_html = $this->normalize($html, $config, $context); $new_html = $this->wrapHTML($new_html, $config, $context); @@ -32,31 +32,31 @@ class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex { , $tokens); return $tokens; } - + } /* -Copyright 2007 Jeroen van der Meer +Copyright 2007 Jeroen van der Meer -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ @@ -1073,7 +1073,7 @@ class HTML5 { // used when parsing entities in text and in attributes. // The behaviour depends on the identity of the next character (the - // one immediately after the U+0026 AMPERSAND character): + // one immediately after the U+0026 AMPERSAND character): switch($this->character($this->char + 1)) { // U+0023 NUMBER SIGN (#) @@ -2229,7 +2229,7 @@ class HTML5TreeConstructer { if($this->elementInScope($token['name'])) { $this->generateImpliedEndTags(); - } + } if(end($this->stack)->nodeName !== $token['name']) { /* Now, if the current node is not an element with the @@ -2608,7 +2608,7 @@ class HTML5TreeConstructer { for($x = count($this->stack) - $n; $x >= $n; $x--) { array_pop($this->stack); } - + } else { $category = $this->getElementCategory($node); @@ -3544,7 +3544,7 @@ class HTML5TreeConstructer { // In theory, this should ever be needed, but just in case if ($token['name'] === '') $token['name'] = 'span'; // arbitrary generic choice } - + $el = $this->dom->createElement($token['name']); foreach($token['attr'] as $attr) { diff --git a/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php b/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php index c7aa1bb86..7402a4eea 100644 --- a/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php +++ b/library/vendor/htmlpurifier-4.5.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php @@ -249,8 +249,8 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy } if ($autoclose && $definition->info[$token->name]->wrap) { - // Check if an element can be wrapped by another - // element to make it valid in a context (for + // Check if an element can be wrapped by another + // element to make it valid in a context (for // example,
      needs a
    • in between) $wrapname = $definition->info[$token->name]->wrap; $wrapdef = $definition->info[$wrapname]; diff --git a/library/vendor/lessphp/tests/ApiTest.php b/library/vendor/lessphp/tests/ApiTest.php index 62bea3bc1..3725dd56c 100644 --- a/library/vendor/lessphp/tests/ApiTest.php +++ b/library/vendor/lessphp/tests/ApiTest.php @@ -96,7 +96,7 @@ div:before { 'color' => 'red', 'base' => '960px' )); - + $this->assertEquals(trim($out), trim(" .magic { color: red; @@ -121,7 +121,7 @@ div:before { $this->assertEquals( $this->compile("result: add-two(10, 20);"), "result: 30;"); - + return $this->less; } diff --git a/library/vendor/tcpdf/config/lang/bul.php b/library/vendor/tcpdf/config/lang/bul.php index 180ad24b3..ca91d7f8f 100755 --- a/library/vendor/tcpdf/config/lang/bul.php +++ b/library/vendor/tcpdf/config/lang/bul.php @@ -1,44 +1,44 @@ -Write($h=0, $txt, $link='', $fill=0, $align='C', $ln=true, $stretch=0, $fi $pdf->Output('example_002.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_003.php b/library/vendor/tcpdf/examples/example_003.php index db9d82e28..5504e471e 100755 --- a/library/vendor/tcpdf/examples/example_003.php +++ b/library/vendor/tcpdf/examples/example_003.php @@ -111,5 +111,5 @@ $pdf->Write($h=0, $txt, $link='', $fill=0, $align='C', $ln=true, $stretch=0, $fi $pdf->Output('example_003.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_006.php b/library/vendor/tcpdf/examples/example_006.php index d61afddc2..2147d87cc 100755 --- a/library/vendor/tcpdf/examples/example_006.php +++ b/library/vendor/tcpdf/examples/example_006.php @@ -323,5 +323,5 @@ $pdf->lastPage(); $pdf->Output('example_006.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_007.php b/library/vendor/tcpdf/examples/example_007.php index 05fc72ae6..92c99d045 100755 --- a/library/vendor/tcpdf/examples/example_007.php +++ b/library/vendor/tcpdf/examples/example_007.php @@ -106,5 +106,5 @@ $pdf->lastPage(); $pdf->Output('example_007.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_008.php b/library/vendor/tcpdf/examples/example_008.php index e874d2ebd..72f13ebee 100755 --- a/library/vendor/tcpdf/examples/example_008.php +++ b/library/vendor/tcpdf/examples/example_008.php @@ -90,5 +90,5 @@ $pdf->Write(5, $utf8text, '', 0, '', false, 0, false, false, 0); $pdf->Output('example_008.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_011.php b/library/vendor/tcpdf/examples/example_011.php index 829c74c22..f26ef824b 100755 --- a/library/vendor/tcpdf/examples/example_011.php +++ b/library/vendor/tcpdf/examples/example_011.php @@ -131,5 +131,5 @@ $pdf->ColoredTable($header, $data); $pdf->Output('example_011.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_017.php b/library/vendor/tcpdf/examples/example_017.php index 64859f96e..8faee04e3 100755 --- a/library/vendor/tcpdf/examples/example_017.php +++ b/library/vendor/tcpdf/examples/example_017.php @@ -110,5 +110,5 @@ $pdf->lastPage(); $pdf->Output('example_017.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_020.php b/library/vendor/tcpdf/examples/example_020.php index 5871b210c..9918b4c9f 100755 --- a/library/vendor/tcpdf/examples/example_020.php +++ b/library/vendor/tcpdf/examples/example_020.php @@ -30,27 +30,27 @@ require_once('../tcpdf.php'); // extend TCPF with custom functions class MYPDF extends TCPDF { - + public function MultiRow($left, $right) { // MultiCell($w, $h, $txt, $border=0, $align='J', $fill=0, $ln=1, $x='', $y='', $reseth=true, $stretch=0) - + $page_start = $this->getPage(); $y_start = $this->GetY(); - + // write the left cell $this->MultiCell(40, 0, $left, 1, 'R', 1, 2, '', '', true, 0); - + $page_end_1 = $this->getPage(); $y_end_1 = $this->GetY(); - + $this->setPage($page_start); - + // write the right cell $this->MultiCell(0, 0, $right, 1, 'J', 0, 1, $this->GetX() ,$y_start, true, 0); - + $page_end_2 = $this->getPage(); $y_end_2 = $this->GetY(); - + // set the new row position by case if (max($page_end_1,$page_end_2) == $page_start) { $ynew = max($y_end_1, $y_end_2); @@ -61,7 +61,7 @@ class MYPDF extends TCPDF { } else { $ynew = $y_end_2; } - + $this->setPage(max($page_end_1,$page_end_2)); $this->SetXY($this->GetX(),$ynew); } @@ -139,5 +139,5 @@ $pdf->lastPage(); $pdf->Output('example_020.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_021.php b/library/vendor/tcpdf/examples/example_021.php index 90e0507a5..943973be0 100755 --- a/library/vendor/tcpdf/examples/example_021.php +++ b/library/vendor/tcpdf/examples/example_021.php @@ -84,5 +84,5 @@ $pdf->lastPage(); $pdf->Output('example_021.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_023.php b/library/vendor/tcpdf/examples/example_023.php index 1405c2259..6ec9ff632 100755 --- a/library/vendor/tcpdf/examples/example_023.php +++ b/library/vendor/tcpdf/examples/example_023.php @@ -106,5 +106,5 @@ $pdf->Cell(0, 10, 'This is the fourth page of group 2', 0, 1, 'L'); $pdf->Output('example_023.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_024.php b/library/vendor/tcpdf/examples/example_024.php index c7555e2e1..5d31cc584 100755 --- a/library/vendor/tcpdf/examples/example_024.php +++ b/library/vendor/tcpdf/examples/example_024.php @@ -133,5 +133,5 @@ $pdf->endLayer(); $pdf->Output('example_024.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_028.php b/library/vendor/tcpdf/examples/example_028.php index 73523dc2e..6c408ba9a 100755 --- a/library/vendor/tcpdf/examples/example_028.php +++ b/library/vendor/tcpdf/examples/example_028.php @@ -131,5 +131,5 @@ $pdf->lastPage(); $pdf->Output('example_028.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_029.php b/library/vendor/tcpdf/examples/example_029.php index 861898158..21f078fc9 100755 --- a/library/vendor/tcpdf/examples/example_029.php +++ b/library/vendor/tcpdf/examples/example_029.php @@ -117,5 +117,5 @@ $pdf->Cell(0, 12, 'DISPLAY PREFERENCES - PAGE 3', 0, 0, 'C'); $pdf->Output('example_029.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_030.php b/library/vendor/tcpdf/examples/example_030.php index 9f9cc0542..a0872505a 100755 --- a/library/vendor/tcpdf/examples/example_030.php +++ b/library/vendor/tcpdf/examples/example_030.php @@ -181,5 +181,5 @@ $pdf->Text(10, 250, 'CoonsPatchMesh()'); $pdf->Output('example_030.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_032.php b/library/vendor/tcpdf/examples/example_032.php index 6bc4e8338..ec597a51f 100755 --- a/library/vendor/tcpdf/examples/example_032.php +++ b/library/vendor/tcpdf/examples/example_032.php @@ -86,5 +86,5 @@ $pdf->ImageEps('../images/pelican.ai', 15, 70, 180); $pdf->Output('example_032.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_034.php b/library/vendor/tcpdf/examples/example_034.php index c5835dbfd..70aa2255b 100755 --- a/library/vendor/tcpdf/examples/example_034.php +++ b/library/vendor/tcpdf/examples/example_034.php @@ -89,5 +89,5 @@ $pdf->StopTransform(); $pdf->Output('example_034.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_035.php b/library/vendor/tcpdf/examples/example_035.php index 7cdd0d6a4..9f7728350 100755 --- a/library/vendor/tcpdf/examples/example_035.php +++ b/library/vendor/tcpdf/examples/example_035.php @@ -104,5 +104,5 @@ $pdf->MultiCell(60, 4, $text, 1, 'C', 1, 1); $pdf->Output('example_035.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_036.php b/library/vendor/tcpdf/examples/example_036.php index 3ee411b93..d82542b27 100755 --- a/library/vendor/tcpdf/examples/example_036.php +++ b/library/vendor/tcpdf/examples/example_036.php @@ -82,5 +82,5 @@ $pdf->Annotation(83, 27, 10, 10, "Text annotation example\naccented letters test $pdf->Output('example_036.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_039.php b/library/vendor/tcpdf/examples/example_039.php index 9849fee3e..9923e78e1 100755 --- a/library/vendor/tcpdf/examples/example_039.php +++ b/library/vendor/tcpdf/examples/example_039.php @@ -97,5 +97,5 @@ $pdf->lastPage(); $pdf->Output('example_039.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_040.php b/library/vendor/tcpdf/examples/example_040.php index 652b708b1..c62f93fbf 100755 --- a/library/vendor/tcpdf/examples/example_040.php +++ b/library/vendor/tcpdf/examples/example_040.php @@ -109,5 +109,5 @@ $pdf->Cell(0, 0, 'PAGE 4', 1, 1, 'C'); $pdf->Output('example_040.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_041.php b/library/vendor/tcpdf/examples/example_041.php index e2e9a2f71..22ed4b7cc 100755 --- a/library/vendor/tcpdf/examples/example_041.php +++ b/library/vendor/tcpdf/examples/example_041.php @@ -83,5 +83,5 @@ $pdf->Annotation(85, 27, 5, 5, 'text file', array('Subtype'=>'FileAttachment', ' $pdf->Output('example_041.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_042.php b/library/vendor/tcpdf/examples/example_042.php index 552523a16..09ce4e807 100755 --- a/library/vendor/tcpdf/examples/example_042.php +++ b/library/vendor/tcpdf/examples/example_042.php @@ -95,5 +95,5 @@ $pdf->Image('../images/img.png', 50, 140, 100, '', '', 'http://www.tcpdf.org', ' $pdf->Output('example_042.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_043.php b/library/vendor/tcpdf/examples/example_043.php index 6697fa202..56053c478 100755 --- a/library/vendor/tcpdf/examples/example_043.php +++ b/library/vendor/tcpdf/examples/example_043.php @@ -78,5 +78,5 @@ $pdf->MultiCell(0, 0, 'DISK CACHING TEST: check the parameters of the class cons $pdf->Output('example_043.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_047.php b/library/vendor/tcpdf/examples/example_047.php index e277ef229..d73635d29 100755 --- a/library/vendor/tcpdf/examples/example_047.php +++ b/library/vendor/tcpdf/examples/example_047.php @@ -102,7 +102,7 @@ $pdf->startTransaction(); $pdf->Write(0, "LINE 7\n"); // commit transaction (actually just frees memory) -$pdf->commitTransaction(); +$pdf->commitTransaction(); // --------------------------------------------------------- @@ -110,5 +110,5 @@ $pdf->commitTransaction(); $pdf->Output('example_047.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_048.php b/library/vendor/tcpdf/examples/example_048.php index 30a88c696..b7b1789ed 100755 --- a/library/vendor/tcpdf/examples/example_048.php +++ b/library/vendor/tcpdf/examples/example_048.php @@ -89,7 +89,7 @@ $tbl = << COL 3 - ROW 3 - + EOD; @@ -111,7 +111,7 @@ $tbl = << COL 3 - ROW 3 - + EOD; @@ -133,7 +133,7 @@ $tbl = << COL 3 - ROW 3 - + EOD; @@ -306,5 +306,5 @@ $pdf->writeHTML($tbl, true, false, false, false, ''); $pdf->Output('example_048.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_049.php b/library/vendor/tcpdf/examples/example_049.php index bf33e72ec..44fd0686d 100755 --- a/library/vendor/tcpdf/examples/example_049.php +++ b/library/vendor/tcpdf/examples/example_049.php @@ -77,8 +77,8 @@ If you are printing user-generated content, tcpdf tag can be unsafe. You can disable this tag by setting to false the K_TCPDF_CALLS_IN_HTML constant on TCPDF configuration file. -For security reasons, the parameters for the 'params' attribute of TCPDF -tag must be prepared as an array and encoded with the +For security reasons, the parameters for the 'params' attribute of TCPDF +tag must be prepared as an array and encoded with the serializeTCPDFtagParameters() method (see the example below). * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/library/vendor/tcpdf/examples/example_053.php b/library/vendor/tcpdf/examples/example_053.php index 8def8d5af..7b599f905 100755 --- a/library/vendor/tcpdf/examples/example_053.php +++ b/library/vendor/tcpdf/examples/example_053.php @@ -101,5 +101,5 @@ $pdf->IncludeJS($js); $pdf->Output('example_053.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/library/vendor/tcpdf/examples/example_055.php b/library/vendor/tcpdf/examples/example_055.php index f249bc5d4..d184d0fb7 100755 --- a/library/vendor/tcpdf/examples/example_055.php +++ b/library/vendor/tcpdf/examples/example_055.php @@ -76,18 +76,18 @@ $pdf->SetFillColor(221,238,255); foreach($core_fonts as $font) { // add a page $pdf->AddPage(); - + // Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') - + // set font for title $pdf->SetFont('helvetica', 'B', 16); - + // print font name $pdf->Cell(0, 10, 'FONT: '.$font, 1, 1, 'C', true, '', 0, false, 'T', 'M'); - + // set font for chars $pdf->SetFont($font, '', 16); - + // print each character for ($i = 0; $i < 256; ++$i) { if (($i > 0) AND (($i % 16) == 0)) { @@ -95,9 +95,9 @@ foreach($core_fonts as $font) { } $pdf->Cell(11.25, 11.25, $pdf->unichr($i), 1, 0, 'C', false, '', 0, false, 'T', 'M'); } - + $pdf->Ln(20); - + // print a pangram $pdf->Cell(0, 0, 'The quick brown fox jumps over the lazy dog', 0, 1, 'C', false, '', 0, false, 'T', 'M'); } diff --git a/library/vendor/tcpdf/examples/example_061.php b/library/vendor/tcpdf/examples/example_061.php index 45b275f1b..6b53e3f6d 100755 --- a/library/vendor/tcpdf/examples/example_061.php +++ b/library/vendor/tcpdf/examples/example_061.php @@ -209,8 +209,8 @@ $pdf->writeHTML($html, true, false, true, false, ''); // REMOVE CELL PADDING // // $pdf->SetCellPadding(0); -// -// This is used to remove any additional vertical space inside a +// +// This is used to remove any additional vertical space inside a // single cell of text. // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -219,7 +219,7 @@ $pdf->writeHTML($html, true, false, true, false, ''); // // $tagvs = array('p' => array(0 => array('h' => 0, 'n' => 0), 1 => array('h' => 0, 'n' => 0))); // $pdf->setHtmlVSpace($tagvs); -// +// // Since the CSS margin command is not yet implemented on TCPDF, you // need to set the spacing of block tags using the following method. @@ -228,7 +228,7 @@ $pdf->writeHTML($html, true, false, true, false, ''); // SET LINE HEIGHT // // $pdf->setCellHeightRatio(1.25); -// +// // You can use the following method to fine tune the line height // (the number is a percentage relative to font height). @@ -237,22 +237,22 @@ $pdf->writeHTML($html, true, false, true, false, ''); // CHANGE THE PIXEL CONVERSION RATIO // // $pdf->setImageScale(0.47); -// -// This is used to adjust the conversion ratio between pixels and +// +// This is used to adjust the conversion ratio between pixels and // document units. Increase the value to get smaller objects. // Since you are using pixel unit, this method is important to set the // right zoom factor. -// -// Suppose that you want to print a web page larger 1024 pixels to +// +// Suppose that you want to print a web page larger 1024 pixels to // fill all the available page width. -// An A4 page is larger 210mm equivalent to 8.268 inches, if you -// subtract 13mm (0.512") of margins for each side, the remaining +// An A4 page is larger 210mm equivalent to 8.268 inches, if you +// subtract 13mm (0.512") of margins for each side, the remaining // space is 184mm (7.244 inches). -// The default resolution for a PDF document is 300 DPI (dots per -// inch), so you have 7.244 * 300 = 2173.2 dots (this is the maximum +// The default resolution for a PDF document is 300 DPI (dots per +// inch), so you have 7.244 * 300 = 2173.2 dots (this is the maximum // number of points you can print at 300 DPI for the given width). // The conversion ratio is approximatively 1024 / 2173.2 = 0.47 px/dots -// If the web page is larger 1280 pixels, on the same A4 page the +// If the web page is larger 1280 pixels, on the same A4 page the // conversion ratio to use is 1280 / 2173.2 = 0.59 pixels/dots // ******************************************************************* @@ -266,5 +266,5 @@ $pdf->lastPage(); $pdf->Output('example_061.pdf', 'I'); //============================================================+ -// END OF FILE +// END OF FILE //============================================================+ diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php index 32bac99ce..10161532d 100644 --- a/modules/monitoring/application/forms/Command/CommandForm.php +++ b/modules/monitoring/application/forms/Command/CommandForm.php @@ -62,7 +62,7 @@ class CommandForm extends Form /** * Get the author name - * + * * @return string */ protected function getAuthorName() diff --git a/modules/monitoring/application/views/helpers/MonitoringState.php b/modules/monitoring/application/views/helpers/MonitoringState.php index 67f473e4a..12a179e67 100644 --- a/modules/monitoring/application/views/helpers/MonitoringState.php +++ b/modules/monitoring/application/views/helpers/MonitoringState.php @@ -8,7 +8,7 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract public function monitoringState($object, $type = 'service') { - + if ($type === 'service') { return $this->servicestates[$object->service_state]; } elseif ($type === 'host') { diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php index 53bd029b2..274b4b1c4 100644 --- a/modules/monitoring/application/views/helpers/PluginOutput.php +++ b/modules/monitoring/application/views/helpers/PluginOutput.php @@ -3,7 +3,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract { protected static $purifier; - + public function pluginOutput($output) { if (preg_match('~<\w+[^>]*>~', $output)) { @@ -38,7 +38,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract protected function fixLinks($html) { - + $ret = array(); $dom = new DOMDocument; $dom->loadXML('
      ' . $html . '
      ', LIBXML_NOERROR | LIBXML_NOWARNING); diff --git a/modules/monitoring/bin/action/list.inc.php b/modules/monitoring/bin/action/list.inc.php index 81d401cb9..6111cb404 100644 --- a/modules/monitoring/bin/action/list.inc.php +++ b/modules/monitoring/bin/action/list.inc.php @@ -105,7 +105,7 @@ foreach ($query->fetchAll() as $key => $row) { "\n\033[01;37;4%dm \033[01;37;4%dm \033[0m ", $host_colors[$row->host_state], $service_colors[$row->service_state] - + ), substr(wordwrap(str_repeat(' ', 30) . preg_replace('~\@{3,}~', '@@@', $row->service_output), 72), 30)) ); } diff --git a/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php b/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php index 581e0ac89..b881aa382 100644 --- a/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php +++ b/modules/monitoring/library/Monitoring/Backend/AbstractBackend.php @@ -93,7 +93,7 @@ class AbstractBackend implements DatasourceInterface * @param bool $fetchAll * @return mixed */ - + public function fetchHost($host, $fetchAll = false) { $fields = array( @@ -247,7 +247,7 @@ class AbstractBackend implements DatasourceInterface ->where('service_description', $service) ->where('host_name', $host); return $select->fetchRow(); - + } diff --git a/modules/monitoring/library/Monitoring/Backend/Ido.php b/modules/monitoring/library/Monitoring/Backend/Ido.php index f936c33e5..53cd18073 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido.php @@ -39,7 +39,7 @@ class Ido extends AbstractBackend $this->prefix = ''; } } - + public function getConnection() { return $this->db; diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php index e05fa2e51..85f87275e 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php @@ -25,7 +25,7 @@ abstract class AbstractQuery extends Query protected $servicegroup_id = 'servicegroup_id'; protected $allowCustomVars = false; - + protected function init() { parent::init(); @@ -81,7 +81,7 @@ abstract class AbstractQuery extends Query . $alias . '.varname = ' . $this->db->quote(strtoupper($name)); - + $this->baseQuery->joinLeft( array($alias => $this->prefix . 'customvariablestatus'), $joinOn, @@ -159,7 +159,7 @@ abstract class AbstractQuery extends Query $this->order_columns[] = array($col, $dir); return $this; } - + public function setRealColumns() { $columns = $this->columns; @@ -178,7 +178,7 @@ abstract class AbstractQuery extends Query if (is_int($alias)) { $alias = $col; } - + $this->columns[$alias] = preg_replace('|\n|', ' ' , $name); } return $this; @@ -200,7 +200,7 @@ abstract class AbstractQuery extends Query { return array_key_exists($alias, $this->idxAliasColumn); } - + protected function aliasToColumnName($alias) { return $this->idxAliasColumn[$alias]; @@ -246,7 +246,7 @@ abstract class AbstractQuery extends Query } return $this; } - + protected function hasCustomvar($customvar) { return array_key_exists($customvar, $this->customVars); @@ -275,7 +275,7 @@ abstract class AbstractQuery extends Query { $filter = ''; $filters = array(); - + $or = array(); $and = array(); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php index 0c1db46b0..3d956f5c6 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php @@ -182,13 +182,13 @@ class EventHistoryQuery extends AbstractQuery 'cndetails.notification_id = n.notification_id', array() ); - + if ($start !== null) { $notifications->where('start_time >= ?', $start); } if ($end !== null) { $notifications->where('start_time <= ?', $end); - } + } $this->subQueries = array( $history, diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php index 98336ea18..495cb3966 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php @@ -40,7 +40,7 @@ class HoststatusQuery extends AbstractQuery 'host_last_time_unreachable' => 'hs.last_time_unreachable', 'host_severity' => 'CASE WHEN hs.current_state = 0 - THEN + THEN CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL THEN 16 ELSE 0 @@ -102,12 +102,12 @@ class HoststatusQuery extends AbstractQuery 'hoststatus' => true, ); } - + protected function joinStatus() { $this->requireVirtualTable('services'); } - + protected function joinServiceStatus() { $this->requireVirtualTable('services'); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php index a0185140e..21087346d 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php @@ -72,12 +72,12 @@ class ServicestatusQuery extends AbstractQuery 'servicestatus' => true, ); } - + protected function joinStatus() { $this->requireVirtualTable('services'); } - + protected function joinServiceStatus() { $this->requireVirtualTable('services'); diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat.php b/modules/monitoring/library/Monitoring/Backend/Statusdat.php index ddee757d1..684ccb2f0 100755 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php index 502eeb722..cf0196cf7 100755 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php index e68eef399..167690857 100644 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php index 0351280e1..d24af7194 100644 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php index 0ac9fae47..edf427724 100644 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php index 3e4e4db9c..55941eff8 100755 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php index 4653c8979..e21881128 100755 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php index 74656badb..ada926f9b 100755 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php index 4c4d54c7c..c96d03724 100644 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php index e1717fc54..a175ff0b8 100644 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php index a9d7612f8..e51cd8c29 100755 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php index f77950d1d..a3900439d 100644 --- a/modules/monitoring/library/Monitoring/Object/Host.php +++ b/modules/monitoring/library/Monitoring/Object/Host.php @@ -32,7 +32,7 @@ class Host extends AbstractObject ->fetchCustomvars() ->fetchComments(); } - + protected function fetchObject() { return $this->backend->select()->from('status', array( diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php index 045bc7eff..b79894e86 100644 --- a/modules/monitoring/library/Monitoring/Object/Service.php +++ b/modules/monitoring/library/Monitoring/Object/Service.php @@ -34,7 +34,7 @@ class Service extends AbstractObject ->fetchComments() ; } - + protected function fetchObject() { return $this->backend->select()->from('status', array( diff --git a/modules/monitoring/library/Monitoring/View/MonitoringView.php b/modules/monitoring/library/Monitoring/View/MonitoringView.php index 278f65030..7709390d1 100644 --- a/modules/monitoring/library/Monitoring/View/MonitoringView.php +++ b/modules/monitoring/library/Monitoring/View/MonitoringView.php @@ -99,7 +99,7 @@ class MonitoringView extends AbstractQuery { return in_array($column, $this->availableColumns); } - + /** * Get a list of all available column names * @@ -116,7 +116,7 @@ class MonitoringView extends AbstractQuery * Extract and apply filters and sort rules from a given request object * * TODO: Enforce Icinga\Web\Request (or similar) as soon as we replaced - * Zend_Controller_Request + * Zend_Controller_Request * * @param mixed $request The request object * @return self diff --git a/test/php/application/forms/Config/AuthenticationFormTest.php b/test/php/application/forms/Config/AuthenticationFormTest.php index 212b9723e..b76c53148 100644 --- a/test/php/application/forms/Config/AuthenticationFormTest.php +++ b/test/php/application/forms/Config/AuthenticationFormTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/application/forms/Config/LoggingFormTest.php b/test/php/application/forms/Config/LoggingFormTest.php index 0187df174..d5a0fff79 100644 --- a/test/php/application/forms/Config/LoggingFormTest.php +++ b/test/php/application/forms/Config/LoggingFormTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/application/forms/Preference/GeneralFormTest.php b/test/php/application/forms/Preference/GeneralFormTest.php index 51ccd13b4..f53d73043 100644 --- a/test/php/application/forms/Preference/GeneralFormTest.php +++ b/test/php/application/forms/Preference/GeneralFormTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php index 2f81ec8fd..9d95def48 100644 --- a/test/php/library/Icinga/Application/LoaderTest.php +++ b/test/php/library/Icinga/Application/LoaderTest.php @@ -9,8 +9,8 @@ use Icinga\Application\Loader; /** * -* Test class for Loader -* Created Thu, 07 Feb 2013 10:07:13 +0000 +* Test class for Loader +* Created Thu, 07 Feb 2013 10:07:13 +0000 * **/ class LoaderTest extends \PHPUnit_Framework_TestCase diff --git a/test/php/library/Icinga/Application/Modules/Manager.php b/test/php/library/Icinga/Application/Modules/Manager.php index 24d2a8c25..7684a4c46 100644 --- a/test/php/library/Icinga/Application/Modules/Manager.php +++ b/test/php/library/Icinga/Application/Modules/Manager.php @@ -44,12 +44,12 @@ class ManagerTest extends \PHPUnit_Framework_TestCase mkdir($moduleDir."/enabledModules"); } - + public function testDetectEnabledModules() { $manager = new ModuleManager(null, "/tmp/enabledModules", array("none")); $this->assertEmpty($manager->listEnabledModules()); - + symlink(getcwd()."/res/testModules/module1", "/tmp/enabledModules/module1"); $manager = new ModuleManager(null, "/tmp/enabledModules", array("none")); $this->assertEquals(array("module1"), $manager->listEnabledModules()); @@ -58,7 +58,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase $manager = new ModuleManager(null, "/tmp/enabledModules", array("none")); $this->assertEquals(array("module1", "module2"), $manager->listEnabledModules()); } - + public function testLoadModule() { $manager = new ModuleManager(null, "/tmp/enabledModules", array("./res/testModules")); @@ -71,7 +71,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase $manager = new ModuleManager(null, "/tmp/enabledModules", array("./res/testModules")); $this->assertEmpty($manager->getLoadedModules()); } - + public function testEnableModule() { $manager = new ModuleManager(null, "/tmp/enabledModules", array(getcwd()."/res/testModules")); @@ -85,7 +85,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase $manager = new ModuleManager(null, "/tmp/enabledModules", array("./res/testModules")); $this->assertNotEmpty($manager->listEnabledModules()); } - + public function testDisableModule() { clearstatcache(true); @@ -101,7 +101,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase $manager = new ModuleManager(null, "/tmp/enabledModules", array("./res/testModules")); $this->assertEmpty($manager->listEnabledModules()); } - + protected function tearDown() { $moduleDir = self::MODULE_TARGET; diff --git a/test/php/library/Icinga/Authentication/BackendMock.php b/test/php/library/Icinga/Authentication/BackendMock.php index 16512f128..c8ac74aed 100644 --- a/test/php/library/Icinga/Authentication/BackendMock.php +++ b/test/php/library/Icinga/Authentication/BackendMock.php @@ -23,8 +23,8 @@ use \Icinga\Authentication\UserBackend as UserBackend; use \Icinga\User; /** -* Simple backend mock that takes an config object -* with the property "credentials", which is an array +* Simple backend mock that takes an config object +* with the property "credentials", which is an array * of Credential this backend authenticates **/ class BackendMock implements UserBackend diff --git a/test/php/library/Icinga/Authentication/LdapUserBackendTest.php b/test/php/library/Icinga/Authentication/LdapUserBackendTest.php index b968e057a..50d700a14 100644 --- a/test/php/library/Icinga/Authentication/LdapUserBackendTest.php +++ b/test/php/library/Icinga/Authentication/LdapUserBackendTest.php @@ -50,8 +50,8 @@ use Icinga\Authentication\Backend\LdapUserBackend; /** * -* Test class for Ldapuserbackend -* Created Mon, 10 Jun 2013 07:54:34 +0000 +* Test class for Ldapuserbackend +* Created Mon, 10 Jun 2013 07:54:34 +0000 * **/ class LdapUserBackendTest extends BaseTestCase @@ -103,7 +103,7 @@ class LdapUserBackendTest extends BaseTestCase return $ldapConn; } - + private function clearTestData($connection) { foreach ($this->users as $ou => $info) { diff --git a/test/php/library/Icinga/Authentication/SessionMock.php b/test/php/library/Icinga/Authentication/SessionMock.php index 13a873959..34cac6a59 100644 --- a/test/php/library/Icinga/Authentication/SessionMock.php +++ b/test/php/library/Icinga/Authentication/SessionMock.php @@ -12,7 +12,7 @@ class SessionMock extends Session { public $isOpen = false; public $isWritten = false; - + public function open() { if (!$this->isOpen && $this->isWritten) { @@ -20,7 +20,7 @@ class SessionMock extends Session } $this->isOpen = true; } - + public function read($keepOpen = false) { $this->open(); @@ -28,7 +28,7 @@ class SessionMock extends Session $this->close(); } } - + public function write($keepOpen = false) { $this->open(); @@ -36,7 +36,7 @@ class SessionMock extends Session $this->close(); } } - + public function close() { $this->isOpen = false; diff --git a/test/php/library/Icinga/Config/PreservingIniWriterTest.php b/test/php/library/Icinga/Config/PreservingIniWriterTest.php index 5e64efe39..a28fa00c0 100644 --- a/test/php/library/Icinga/Config/PreservingIniWriterTest.php +++ b/test/php/library/Icinga/Config/PreservingIniWriterTest.php @@ -85,7 +85,7 @@ Prop5="true" [child : parent] PropOne="overwritten" -;10 +;10 '; $this->writeToTmp('orig', $ini); diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php index d516fd6de..8f07dc5a5 100644 --- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php +++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php @@ -6,7 +6,7 @@ require_once '../../library/Icinga/Protocol/Ldap/LdapUtils.php'; /** * * Test class for Query -* Created Wed, 13 Mar 2013 12:57:11 +0000 +* Created Wed, 13 Mar 2013 12:57:11 +0000 * **/ class QueryTest extends \PHPUnit_Framework_TestCase @@ -43,7 +43,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::Limit() + * Test for Query::Limit() * **/ public function testLimit() @@ -54,7 +54,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::HasLimit() + * Test for Query::HasLimit() * **/ public function testHasLimit() @@ -66,7 +66,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::HasOffset() + * Test for Query::HasOffset() * **/ public function testHasOffset() @@ -78,7 +78,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::GetLimit() + * Test for Query::GetLimit() * **/ public function testGetLimit() @@ -88,7 +88,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::GetOffset() + * Test for Query::GetOffset() * **/ public function testGetOffset() @@ -98,7 +98,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::FetchTree() + * Test for Query::FetchTree() * **/ public function testFetchTree() @@ -123,7 +123,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::FetchOne() + * Test for Query::FetchOne() * **/ public function testFetchOne() @@ -131,7 +131,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::FetchPairs() + * Test for Query::FetchPairs() * **/ public function testFetchPairs() @@ -139,7 +139,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::From() + * Test for Query::From() * **/ public function testFrom() @@ -148,7 +148,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::Where() + * Test for Query::Where() * **/ public function testWhere() @@ -157,7 +157,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::Order() + * Test for Query::Order() * **/ public function testOrder() @@ -167,7 +167,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::ListFields() + * Test for Query::ListFields() * **/ public function testListFields() @@ -180,7 +180,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::GetSortColumns() + * Test for Query::GetSortColumns() * **/ public function testGetSortColumns() @@ -199,7 +199,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::__toString() + * Test for Query::__toString() * **/ public function test__toString() @@ -210,7 +210,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase } /** - * Test for Query::__destruct() + * Test for Query::__destruct() * **/ public function test__destruct() diff --git a/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php b/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php index 87c45217a..5992f154b 100755 --- a/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php +++ b/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php @@ -12,14 +12,14 @@ require_once('../../library/Icinga/Protocol/Livestatus/Query.php'); /** * -* Test class for Connection +* Test class for Connection * **/ class ConnectionTest extends TestCase { /** - * Test for Connection::Select() + * Test for Connection::Select() * **/ public function testSelect() diff --git a/test/php/library/Icinga/Protocol/Statusdat/ParserTest.php b/test/php/library/Icinga/Protocol/Statusdat/ParserTest.php index 23210af35..93b8b1f8b 100755 --- a/test/php/library/Icinga/Protocol/Statusdat/ParserTest.php +++ b/test/php/library/Icinga/Protocol/Statusdat/ParserTest.php @@ -7,8 +7,8 @@ require_once(realpath("../../library/Icinga/Protocol/Statusdat/Parser.php")); use Icinga\Protocol\Statusdat\Parser; /** * -* Test class for Parser -* Created Wed, 16 Jan 2013 15:15:16 +0000 +* Test class for Parser +* Created Wed, 16 Jan 2013 15:15:16 +0000 * **/ class ParserTest extends \PHPUnit_Framework_TestCase diff --git a/test/php/library/Icinga/Protocol/Statusdat/ReaderTest.php b/test/php/library/Icinga/Protocol/Statusdat/ReaderTest.php index 64a5143a5..489b5ca89 100755 --- a/test/php/library/Icinga/Protocol/Statusdat/ReaderTest.php +++ b/test/php/library/Icinga/Protocol/Statusdat/ReaderTest.php @@ -13,8 +13,8 @@ if (!defined('APPLICATION_PATH')) { } /** * -* Test class for Reader -* Created Wed, 16 Jan 2013 15:15:16 +0000 +* Test class for Reader +* Created Wed, 16 Jan 2013 15:15:16 +0000 * **/ class ConfigMock { diff --git a/test/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php b/test/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php index 574fc0dfd..720bbfc1d 100755 --- a/test/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php +++ b/test/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php @@ -8,7 +8,7 @@ class RuntimestatecontainerTest extends \PHPUnit_Framework_TestCase { /** - * Test for RuntimeStateContainer::__get() + * Test for RuntimeStateContainer::__get() * **/ public function testPropertyResolving() diff --git a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php index 75c50ef2c..3a77d7b22 100644 --- a/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php +++ b/test/php/library/Icinga/Web/Form/Validator/DateFormatValidatorTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php index b8c5b6e34..63276aef6 100644 --- a/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php +++ b/test/php/library/Icinga/Web/Form/Validator/TimeFormatValidatorTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php index c4d9b50bb..c3d29ff85 100644 --- a/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php +++ b/test/php/library/Icinga/Web/Form/Validator/WritablePathValidatorTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/library/Icinga/Web/FormTest.php b/test/php/library/Icinga/Web/FormTest.php index 88e5c9b1f..bf5b8db75 100644 --- a/test/php/library/Icinga/Web/FormTest.php +++ b/test/php/library/Icinga/Web/FormTest.php @@ -81,7 +81,7 @@ class FormTest extends Zend_Test_PHPUnit_ControllerTestCase /** * Tests whether automatic form submission can only be enabled for existing elements - * + * * @expectedException Icinga\Exception\ProgrammingError */ function testEnableAutoSubmitExisting() diff --git a/test/php/library/Icinga/Web/HookTest.php b/test/php/library/Icinga/Web/HookTest.php index 5239438dd..ec2b59841 100644 --- a/test/php/library/Icinga/Web/HookTest.php +++ b/test/php/library/Icinga/Web/HookTest.php @@ -3,8 +3,8 @@ namespace Tests\Icinga\Web; /** * -* Test class for Hook -* Created Fri, 22 Mar 2013 09:44:40 +0000 +* Test class for Hook +* Created Fri, 22 Mar 2013 09:44:40 +0000 * **/ require_once("../../library/Icinga/Exception/ProgrammingError.php"); @@ -78,8 +78,8 @@ class HookTest extends \PHPUnit_Framework_TestCase /** - * Test for Hook::Has() - * Note: This method is static! + * Test for Hook::Has() + * Note: This method is static! * **/ public function testHas() @@ -93,8 +93,8 @@ class HookTest extends \PHPUnit_Framework_TestCase } /** - * Test for Hook::CreateInstance() - * Note: This method is static! + * Test for Hook::CreateInstance() + * Note: This method is static! * **/ public function testCreateInstance() @@ -136,8 +136,8 @@ class HookTest extends \PHPUnit_Framework_TestCase } /** - * Test for Hook::All() - * Note: This method is static! + * Test for Hook::All() + * Note: This method is static! * **/ public function testAll() @@ -154,8 +154,8 @@ class HookTest extends \PHPUnit_Framework_TestCase } /** - * Test for Hook::First() - * Note: This method is static! + * Test for Hook::First() + * Note: This method is static! * **/ public function testFirst() diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php index 78cf32fb5..37fcdd238 100755 --- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php +++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php @@ -74,8 +74,8 @@ class TestPaginatorAdapter implements \Zend_Paginator_Adapter_Interface /** * -* Test class for Slidingwithborder -* Created Wed, 16 Jan 2013 15:15:16 +0000 +* Test class for Slidingwithborder +* Created Wed, 16 Jan 2013 15:15:16 +0000 * **/ class SlidingwithborderTest extends \PHPUnit_Framework_TestCase diff --git a/test/php/library/Icinga/Web/RequestMock.php b/test/php/library/Icinga/Web/RequestMock.php index cc9414712..bbd248e4b 100644 --- a/test/php/library/Icinga/Web/RequestMock.php +++ b/test/php/library/Icinga/Web/RequestMock.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/library/Icinga/Web/UrlTest.php b/test/php/library/Icinga/Web/UrlTest.php index 6488b7d9c..b15f1ea05 100644 --- a/test/php/library/Icinga/Web/UrlTest.php +++ b/test/php/library/Icinga/Web/UrlTest.php @@ -188,7 +188,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase $request->baseUrl = 'path/to'; $request->path = 'my/test/url.html'; $request->query = array( - 'param1' => 'value1', + 'param1' => 'value1', 'param2' => array('key1' => 'value1', 'key2' => 'value2') ); $url = Url::fromRequest(array(), $request); diff --git a/test/php/library/Icinga/Web/ViewMock.php b/test/php/library/Icinga/Web/ViewMock.php index 85061177d..0f9c7555c 100644 --- a/test/php/library/Icinga/Web/ViewMock.php +++ b/test/php/library/Icinga/Web/ViewMock.php @@ -3,24 +3,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/library/Icinga/Web/Widget/Tabextension/OutputFormatTest.php b/test/php/library/Icinga/Web/Widget/Tabextension/OutputFormatTest.php index bc6fc8500..30bba2e63 100644 --- a/test/php/library/Icinga/Web/Widget/Tabextension/OutputFormatTest.php +++ b/test/php/library/Icinga/Web/Widget/Tabextension/OutputFormatTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/library/Icinga/Web/Widget/TabsTest.php b/test/php/library/Icinga/Web/Widget/TabsTest.php index 91c793bd7..ebe4ab196 100644 --- a/test/php/library/Icinga/Web/Widget/TabsTest.php +++ b/test/php/library/Icinga/Web/Widget/TabsTest.php @@ -2,24 +2,24 @@ // {{{ICINGA_LICENSE_HEADER}}} /** * This file is part of Icinga 2 Web. - * + * * Icinga 2 Web - Head for multiple monitoring backends. * Copyright (C) 2013 Icinga Development Team - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * @copyright 2013 Icinga Development Team * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 * @author Icinga Development Team diff --git a/test/php/regression/Bug4102Test.php b/test/php/regression/Bug4102Test.php index dd232ac73..6191add80 100644 --- a/test/php/regression/Bug4102Test.php +++ b/test/php/regression/Bug4102Test.php @@ -8,7 +8,7 @@ namespace Tests\Icinga\Regression; /** * Class Bug4102 - * + * * Bogus regression test * * @see https://dev.icinga.org/issues/4102