Skip to content
Browse files

Removed brackets from require and include statements

As per Sonar advice IncludingFileBracketsNotRequired
  • Loading branch information...
1 parent f1a14c8 commit 7d2bf522a1358a1276c6e5d033a01479858212fc @jeroenrnl committed
Showing with 260 additions and 260 deletions.
  1. +1 −1 php/UnitTests/XMLdataTest.php
  2. +1 −1 php/UnitTests/anonymousUserTest.php
  3. +5 −5 php/UnitTests/createTestData/createTest.php
  4. +1 −1 php/UnitTests/photoTest.php
  5. +1 −1 php/UnitTests/ratingTest.php
  6. +1 −1 php/UnitTests/relationTest.php
  7. +34 −34 php/UnitTests/testSetup.php
  8. +1 −1 php/UnitTests/userTest.php
  9. +2 −2 php/admin.php
  10. +4 −4 php/album.php
  11. +5 −5 php/albums.php
  12. +1 −1 php/auth.inc.php
  13. +1 −1 php/calendar.inc.php
  14. +2 −2 php/calendar.php
  15. +5 −5 php/categories.php
  16. +4 −4 php/category.php
  17. +5 −5 php/classes/anonymousUser.inc.php
  18. +3 −3 php/classes/conf.inc.php
  19. +1 −1 php/classes/template.inc.php
  20. +4 −4 php/color_scheme.php
  21. +3 −3 php/color_schemes.php
  22. +4 −4 php/comment.php
  23. +3 −3 php/comments.php
  24. +1 −1 php/config.php
  25. +2 −2 php/css.php
  26. +3 −3 php/define_annotated_photo.php
  27. +4 −4 php/download.php
  28. +1 −1 php/edit_photo.inc.php
  29. +3 −3 php/edit_photos.php
  30. +1 −1 php/footer.inc.php
  31. +1 −1 php/getxmldata.php
  32. +5 −5 php/group.php
  33. +3 −3 php/groups.php
  34. +1 −1 php/header.inc.php
  35. +4 −4 php/image.php
  36. +1 −1 php/import.inc.php
  37. +3 −3 php/import.php
  38. +39 −39 php/include.inc.php
  39. +4 −4 php/info.php
  40. +1 −1 php/logon.php
  41. +3 −3 php/mail.php
  42. +3 −3 php/notify.php
  43. +4 −4 php/page.php
  44. +3 −3 php/pages.php
  45. +4 −4 php/pageset.php
  46. +3 −3 php/pagesets.php
  47. +3 −3 php/password.php
  48. +3 −3 php/people.php
  49. +7 −7 php/person.php
  50. +5 −5 php/photo.php
  51. +3 −3 php/photos.php
  52. +5 −5 php/place.php
  53. +5 −5 php/places.php
  54. +3 −3 php/prefs.php
  55. +4 −4 php/relation.php
  56. +1 −1 php/reports.php
  57. +9 −9 php/search.php
  58. +2 −2 php/slideshow.php
  59. +2 −2 php/templates/default/admin.tpl.php
  60. +2 −2 php/templates/default/config.tpl.php
  61. +2 −2 php/templates/default/main.tpl.php
  62. +2 −2 php/track.php
  63. +1 −1 php/tracks.php
  64. +5 −5 php/user.php
  65. +3 −3 php/users.php
  66. +3 −3 php/zoph.php
  67. +1 −1 php/zoph_calendar.inc.php
View
2 php/UnitTests/XMLdataTest.php
@@ -21,7 +21,7 @@
* @author Jeroen Roos
*/
-require_once("testSetup.php");
+require_once "testSetup.php";
/**
* Test XML API
View
2 php/UnitTests/anonymousUserTest.php
@@ -20,7 +20,7 @@
* @package ZophUnitTest
* @author Jeroen Roos
*/
-require_once("php/UnitTests/testSetup.php");
+require_once "php/UnitTests/testSetup.php";
/**
* Test class for anonymousUser.
* @package ZophUnitTest
View
10 php/UnitTests/createTestData/createTest.php
@@ -27,12 +27,12 @@
define("TEST", true);
-require_once("testData.php");
-require_once("testImage.php");
+require_once "testData.php";
+require_once "testImage.php";
-require_once("../../settings.inc.php");
-require_once("../../include.inc.php");
-require_once("../../cli/cliimport.inc.php");
+require_once "../../settings.inc.php";
+require_once "../../include.inc.php";
+require_once "../../cli/cliimport.inc.php";
$lang=new language("en");
View
2 php/UnitTests/photoTest.php
@@ -21,7 +21,7 @@
* @author Jeroen Roos
*/
-require_once("testSetup.php");
+require_once "testSetup.php";
/**
* Test photo class
View
2 php/UnitTests/ratingTest.php
@@ -20,7 +20,7 @@
* @package ZophUnitTest
* @author Jeroen Roos
*/
-require_once("testSetup.php");
+require_once "testSetup.php";
/**
* Test rating class
*
View
2 php/UnitTests/relationTest.php
@@ -20,7 +20,7 @@
* @package ZophUnitTest
* @author Jeroen Roos
*/
-require_once("testSetup.php");
+require_once "testSetup.php";
/**
* Test relation class
*
View
68 php/UnitTests/testSetup.php
@@ -23,40 +23,40 @@
define("TEST", true);
-//require_once("php/settings.inc.php");
-require_once("php/include.inc.php");
-require_once("PHPUnit/Extensions/Database/TestCase.php");
-require_once("PHPUnit/Extensions/Database/ITester.php");
-require_once("PHPUnit/Extensions/Database/AbstractTester.php");
-require_once("PHPUnit/Extensions/Database/DefaultTester.php");
-require_once("PHPUnit/Extensions/Database/DB/IDatabaseConnection.php");
-require_once("PHPUnit/Extensions/Database/DB/DefaultDatabaseConnection.php");
-require_once("PHPUnit/Extensions/Database/DB/IMetaData.php");
-require_once("PHPUnit/Extensions/Database/DB/MetaData.php");
-require_once("PHPUnit/Extensions/Database/DB/MetaData/MySQL.php");
-require_once("PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php");
-require_once("PHPUnit/Extensions/Database/Operation/Factory.php");
-require_once("PHPUnit/Extensions/Database/Operation/Composite.php");
-require_once("PHPUnit/Extensions/Database/Operation/Truncate.php");
-require_once("PHPUnit/Extensions/Database/Operation/RowBased.php");
-require_once("PHPUnit/Extensions/Database/Operation/Insert.php");
-require_once("PHPUnit/Extensions/Database/Operation/Null.php");
-require_once("PHPUnit/Extensions/Database/Operation/Exception.php");
-require_once("PHPUnit/Extensions/Database/DataSet/IDataSet.php");
-require_once("PHPUnit/Extensions/Database/DataSet/AbstractDataSet.php");
-require_once("PHPUnit/Extensions/Database/DB/DataSet.php");
-require_once("PHPUnit/Extensions/Database/DataSet/AbstractXmlDataSet.php");
-require_once("PHPUnit/Extensions/Database/DataSet/MysqlXmlDataSet.php");
-require_once("PHPUnit/Extensions/Database/DataSet/ITableMetaData.php");
-require_once("PHPUnit/Extensions/Database/DataSet/AbstractTableMetaData.php");
-require_once("PHPUnit/Extensions/Database/DataSet/DefaultTableMetaData.php");
-require_once("PHPUnit/Extensions/Database/DataSet/ITable.php");
-require_once("PHPUnit/Extensions/Database/DataSet/AbstractTable.php");
-require_once("PHPUnit/Extensions/Database/DataSet/DefaultTable.php");
-require_once("PHPUnit/Extensions/Database/DataSet/ITableIterator.php");
-require_once("PHPUnit/Extensions/Database/DataSet/DefaultTableIterator.php");
-require_once("databaseTest.inc.php");
-require_once("testHelpers.inc.php");
+//require_once "php/settings.inc.php";
+require_once "php/include.inc.php";
+require_once "PHPUnit/Extensions/Database/TestCase.php";
+require_once "PHPUnit/Extensions/Database/ITester.php";
+require_once "PHPUnit/Extensions/Database/AbstractTester.php";
+require_once "PHPUnit/Extensions/Database/DefaultTester.php";
+require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
+require_once "PHPUnit/Extensions/Database/DB/DefaultDatabaseConnection.php";
+require_once "PHPUnit/Extensions/Database/DB/IMetaData.php";
+require_once "PHPUnit/Extensions/Database/DB/MetaData.php";
+require_once "PHPUnit/Extensions/Database/DB/MetaData/MySQL.php";
+require_once "PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php";
+require_once "PHPUnit/Extensions/Database/Operation/Factory.php";
+require_once "PHPUnit/Extensions/Database/Operation/Composite.php";
+require_once "PHPUnit/Extensions/Database/Operation/Truncate.php";
+require_once "PHPUnit/Extensions/Database/Operation/RowBased.php";
+require_once "PHPUnit/Extensions/Database/Operation/Insert.php";
+require_once "PHPUnit/Extensions/Database/Operation/Null.php";
+require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
+require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
+require_once "PHPUnit/Extensions/Database/DataSet/AbstractDataSet.php";
+require_once "PHPUnit/Extensions/Database/DB/DataSet.php";
+require_once "PHPUnit/Extensions/Database/DataSet/AbstractXmlDataSet.php";
+require_once "PHPUnit/Extensions/Database/DataSet/MysqlXmlDataSet.php";
+require_once "PHPUnit/Extensions/Database/DataSet/ITableMetaData.php";
+require_once "PHPUnit/Extensions/Database/DataSet/AbstractTableMetaData.php";
+require_once "PHPUnit/Extensions/Database/DataSet/DefaultTableMetaData.php";
+require_once "PHPUnit/Extensions/Database/DataSet/ITable.php";
+require_once "PHPUnit/Extensions/Database/DataSet/AbstractTable.php";
+require_once "PHPUnit/Extensions/Database/DataSet/DefaultTable.php";
+require_once "PHPUnit/Extensions/Database/DataSet/ITableIterator.php";
+require_once "PHPUnit/Extensions/Database/DataSet/DefaultTableIterator.php";
+require_once "databaseTest.inc.php";
+require_once "testHelpers.inc.php";
user::setCurrent(new user(1));
conf::set("path.images", getcwd() . "/.images");
?>
View
2 php/UnitTests/userTest.php
@@ -21,7 +21,7 @@
* @author Jeroen Roos
*/
-require_once("testSetup.php");
+require_once "testSetup.php";
/**
* Test class for user.
*
View
4 php/admin.php
@@ -16,13 +16,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
}
$title=translate("Adminpage");
- require_once("admin.inc.php");
+ require_once "admin.inc.php";
$adminpages=admin::getArray();
$tpl=new template("admin", array(
View
8 php/album.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
@@ -35,7 +35,7 @@
$obj->update();
$action = "display";
} else {
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
}
if ($action == "display") {
@@ -50,7 +50,7 @@
$title = translate("New Album");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<?php
if ($action == "confirm") {
@@ -88,5 +88,5 @@
?>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
10 php/albums.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$_view=getvar("_view");
if(empty($_view)) {
@@ -44,7 +44,7 @@
$title = $album->get("parent_album_id") ? $album->get("album") : translate("Albums");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php
@@ -58,9 +58,9 @@
</h1>
<?php
if($user->is_admin()) {
- include("selection.inc.php");
+ include "selection.inc.php";
}
- include("show_page.inc.php");
+ include "show_page.inc.php";
if($show_orig) {
?>
<div class="main">
@@ -173,5 +173,5 @@
<?php
} // if show_orig
echo $page_html;
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
2 php/auth.inc.php
@@ -67,7 +67,7 @@
} else if (empty($user)) {
$hash=getvar("hash");
if(defined("IMAGE_PHP") && conf::get("share.enable") && !empty($hash)) {
- require_once("classes/anonymousUser.inc.php");
+ require_once "classes/anonymousUser.inc.php";
$user = new anonymousUser();
} else {
$uname = getvar("uname");
View
2 php/calendar.inc.php
@@ -46,7 +46,7 @@
source file => date_utils.php."
*/
-require_once("date_utils.php");
+require_once "date_utils.php";
class Calendar
{
View
4 php/calendar.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$date = getvar("date");
$year = getvar("year");
@@ -42,7 +42,7 @@
$title = "$monthName $year";
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1><?php echo translate("calendar") ?></h1>
<div class="main">
View
10 php/categories.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$_view=getvar("_view");
if(empty($_view)) {
@@ -44,7 +44,7 @@
$title = $category->get("parent_category_id") ? $category->get("category") : translate("Categories");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php
@@ -57,9 +57,9 @@
</h1>
<?php
if($user->is_admin()) {
- include("selection.inc.php");
+ include "selection.inc.php";
}
- include("show_page.inc.php");
+ include "show_page.inc.php";
if($show_orig) {
?>
<div class="main">
@@ -185,5 +185,5 @@
<?php
} // if show_orig
echo $page_html;
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
8 php/category.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
@@ -35,7 +35,7 @@
$obj->update();
$action = "display";
} else {
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
}
if ($action == "display") {
@@ -50,7 +50,7 @@
$title = translate("New Category");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php
@@ -87,5 +87,5 @@
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
10 php/classes/anonymousUser.inc.php
@@ -29,11 +29,11 @@
/**
* @todo These requires should be removed once all classes can be autoloaded
*/
-require_once("util.inc.php");
-require_once("variables.inc.php");
-require_once("classes/zophTable.inc.php");
-require_once("user.inc.php");
-require_once("prefs.inc.php");
+require_once "util.inc.php";
+require_once "variables.inc.php";
+require_once "classes/zophTable.inc.php";
+require_once "user.inc.php";
+require_once "prefs.inc.php";
/**
* A class representing an anonymous user of Zoph.
View
6 php/classes/conf.inc.php
@@ -22,9 +22,9 @@
* @author Jeroen Roos
*/
-require_once("database.inc.php");
-require_once("user.inc.php");
-require_once("photo.inc.php");
+require_once "database.inc.php";
+require_once "user.inc.php";
+require_once "photo.inc.php";
/**
* conf is the main object for access to Zoph's configuration
View
2 php/classes/template.inc.php
@@ -102,7 +102,7 @@ public function __toString() {
}
try {
ob_start();
- include($this->template);
+ include $this->template;
return ob_get_clean();
} catch(Exception $e) {
echo $e->getMessage();
View
8 php/color_scheme.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
$_action = "display";
@@ -35,7 +35,7 @@
}
$obj = &$color_scheme;
$redirect = "color_schemes.php";
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
if ($_action == "update") {
$user->prefs->load();
@@ -49,7 +49,7 @@
$title = translate("New Color Scheme");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<?php
if ($action == "display") {
@@ -140,4 +140,4 @@
<br>
</div>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
6 php/color_schemes.php
@@ -16,14 +16,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
}
$title = translate("Color Schemes");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<span class="actionlink">
@@ -51,5 +51,5 @@
?>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
8 php/comment.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!conf::get("feature.comments")) {
redirect("zoph.php");
@@ -59,7 +59,7 @@
$obj = &$comment;
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
if($_action == "insert") {
$comment->addToPhoto($photo);
@@ -70,7 +70,7 @@
} else {
$title = translate("Add comment");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<?php
if ($action == "confirm") {
@@ -142,5 +142,5 @@
<?php
}
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
6 php/comments.php
@@ -15,13 +15,13 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!conf::get("feature.comments")) {
redirect("zoph.php");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php echo translate("Comments") ?>
@@ -38,5 +38,5 @@
}
?>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
2 php/config.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$title=translate("Configuration");
if (!$user->is_admin()) {
View
4 php/css.php
@@ -23,12 +23,12 @@
} else {
echo "/* This is the customized CSS, user is logged on */";
}
-require_once("include.inc.php");
+require_once "include.inc.php";
$tpl=conf::get("interface.template");
$css="templates/" . $tpl . "/css.php";
if(!file_exists($css)) {
$css="templates/default/css.php";
}
-require_once($css);
+require_once $css;
?>
View
6 php/define_annotated_photo.php
@@ -26,14 +26,14 @@
* Copyright 2003 Nixon P. Childs
* **************************************************************************/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!conf::get("feature.annotate")) {
redirect("zoph.php");
}
$title = translate("Annotate Photo");
- require_once("header.inc.php");
+ require_once "header.inc.php";
$photo_id = getvar("photo_id");
$photo = new photo($photo_id);
$found = $photo->lookup();
@@ -254,4 +254,4 @@
<br>
</div>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
8 php/download.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$vars=clean_request_vars($request_vars);
$_action=getvar("_action");
@@ -48,7 +48,7 @@
flush();
exit;
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php echo translate("Download zipfile") . "\n" ?>
@@ -118,7 +118,7 @@
<br>
</div>
<?
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
} else {
echo translate("No photos were found matching your search criteria.") . "\n";
}
@@ -188,6 +188,6 @@
</div>
<br>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
}
?>
View
2 php/edit_photo.inc.php
@@ -29,7 +29,7 @@
</h1>
<?php
echo check_js($user);
- require_once("selection.inc.php");
+ require_once "selection.inc.php";
?>
<div class="main">
View
6 php/edit_photos.php
@@ -14,7 +14,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$_cols = (int) getvar("_cols");
$_rows = (int) getvar("_rows");
@@ -75,7 +75,7 @@
$title_bar = translate("edit photos");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php
@@ -416,4 +416,4 @@
<br>
</div>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
2 php/footer.inc.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- // Insert or include() any custom footers here
+ // Insert or include any custom footers here
?>
</body>
</html>
View
2 php/getxmldata.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-require_once("include.inc.php");
+require_once "include.inc.php";
header("Content-Type: text/xml");
session_write_close();
View
10 php/group.php
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
@@ -85,7 +85,7 @@
} else {
$obj = &$group;
$redirect = "groups.php";
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
}
// edit after insert to add album permissions
@@ -100,7 +100,7 @@
$title = translate("New Group");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<?php
if ($action == "display") {
@@ -175,7 +175,7 @@
<?php echo sprintf(translate("Confirm deletion of '%s'"), $group->get("group_name")) ?>
<?php
} else {
-require_once("edit_group.inc.php");
+require_once "edit_group.inc.php";
?>
<form action="group.php" method="post" class="grouppermissions">
<table class="permissions">
@@ -316,4 +316,4 @@
} // edit
?>
</div>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
6 php/groups.php
@@ -16,14 +16,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
}
$title = translate("Groups");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<span class="actionlink">
@@ -58,5 +58,5 @@
?>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
2 php/header.inc.php
@@ -185,5 +185,5 @@
?>
</ul>
<?php
-require_once("breadcrumbs.inc.php");
+require_once "breadcrumbs.inc.php";
?>
View
8 php/image.php
@@ -21,11 +21,11 @@
* @author Alan Shutko
*/
session_cache_limiter("public");
- require_once("variables.inc.php");
+ require_once "variables.inc.php";
$hash = getvar("hash");
$annotated = getvar('annotated');
define("IMAGE_PHP", 1);
- require_once("include.inc.php");
+ require_once "include.inc.php";
$photo_id = getvar("photo_id");
$type = getvar("type");
@@ -104,7 +104,7 @@
}
exit;
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php echo translate("error") ?>
@@ -113,5 +113,5 @@
<?php echo translate("The image you requested could not be displayed.") ?>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
2 php/import.inc.php
@@ -18,7 +18,7 @@
* @author Jeroen Roos
* @package Zoph
*/
-require_once("exif.inc.php");
+require_once "exif.inc.php";
/**
* This class holds the generalized functions importing images
View
6 php/import.php
@@ -19,7 +19,7 @@
* @package Zoph
*/
-require_once("include.inc.php");
+require_once "include.inc.php";
if ((!conf::get("import.enable")) || (!$user->is_admin() && !$user->get("import"))) {
redirect("zoph.php");
}
@@ -34,7 +34,7 @@
$title = translate("Import");
if (empty($_action)) {
- require_once("header.inc.php");
+ require_once "header.inc.php";
}
session_write_close();
@@ -75,7 +75,7 @@
));
$tpl->js=array("js/util.js", "js/xml.js", "js/import.js");
echo $tpl;
- include("footer.inc.php");
+ include "footer.inc.php";
} else if ($_action=="browse") {
if(conf::get("import.upload")) {
$upload_num = $upload_id . "_" . $num;
View
78 php/include.inc.php
@@ -21,74 +21,74 @@
*/
function zophAutoloadClass($class) {
- @include_once("classes/" . $class . ".inc.php");
+ @include_once "classes/" . $class . ".inc.php";
}
function zophAutoloadInterface($interface) {
- @include_once("interfaces/" . $interface . ".inc.php");
+ @include_once "interfaces/" . $interface . ".inc.php";
}
spl_autoload_register("zophAutoloadClass");
spl_autoload_register("zophAutoloadInterface");
- require_once("exception.inc.php");
- require_once("variables.inc.php");
- require_once("log.inc.php");
+ require_once "exception.inc.php";
+ require_once "variables.inc.php";
+ require_once "log.inc.php";
- require_once("config.inc.php");
- require_once("settings.inc.php");
- require_once("requirements.inc.php");
- require_once("util.inc.php");
+ require_once "config.inc.php";
+ require_once "settings.inc.php";
+ require_once "requirements.inc.php";
+ require_once "util.inc.php";
- require_once("validator.inc.php");
+ require_once "validator.inc.php";
- require_once("zoph_calendar.inc.php");
+ require_once "zoph_calendar.inc.php";
/**
* @todo remove once all global functions have been removed
*/
- require_once("classes/zophTable.inc.php");
- require_once("classes/zophTreeTable.inc.php");
+ require_once "classes/zophTable.inc.php";
+ require_once "classes/zophTreeTable.inc.php";
- require_once("place.inc.php");
- require_once("track.inc.php");
- require_once("point.inc.php");
+ require_once "place.inc.php";
+ require_once "track.inc.php";
+ require_once "point.inc.php";
- require_once("person.inc.php");
+ require_once "person.inc.php";
- require_once("group_permissions.inc.php");
- require_once("color_scheme.inc.php");
- require_once("prefs.inc.php");
- require_once("user.inc.php");
- require_once("group.inc.php");
+ require_once "group_permissions.inc.php";
+ require_once "color_scheme.inc.php";
+ require_once "prefs.inc.php";
+ require_once "user.inc.php";
+ require_once "group.inc.php";
- require_once("database.inc.php");
+ require_once "database.inc.php";
if(!defined("LOGON")) {
if(!defined("TEST")) {
- require_once("auth.inc.php");
+ require_once "auth.inc.php";
}
- require_once("album.inc.php");
- require_once("category.inc.php");
- require_once("code.inc.php");
- require_once("comment.inc.php");
+ require_once "album.inc.php";
+ require_once "category.inc.php";
+ require_once "code.inc.php";
+ require_once "comment.inc.php";
- require_once("page.inc.php");
- require_once("pageset.inc.php");
+ require_once "page.inc.php";
+ require_once "pageset.inc.php";
- require_once("file.inc.php");
+ require_once "file.inc.php";
- require_once("photo.inc.php");
- require_once("saved_search.inc.php");
- require_once("photo_search.inc.php");
+ require_once "photo.inc.php";
+ require_once "saved_search.inc.php";
+ require_once "photo_search.inc.php";
- require_once("import.inc.php");
+ require_once "import.inc.php";
if(defined("CLI") || defined("TEST")) {
- require_once("cli/cli.inc.php");
- require_once("cli/arguments.inc.php");
- require_once("cli/cliimport.inc.php");
+ require_once "cli/cli.inc.php";
+ require_once "cli/arguments.inc.php";
+ require_once "cli/cliimport.inc.php";
} else {
- require_once("webimport.inc.php");
+ require_once "webimport.inc.php";
}
}
?>
View
8 php/info.php
@@ -15,10 +15,10 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$title = translate("About");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1><?php echo translate("about") ?></h1>
<div class="main">
@@ -49,9 +49,9 @@
<p>
<?php echo translate("Originally written by Jason Geiger, now maintained by Jeroen Roos with thanks to the following for their contributions:", 0) ?>
</p>
-<?php include('credits.html'); ?>
+<?php include "credits.html"; ?>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
2 php/logon.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
define("LOGON", true);
- require_once("include.inc.php");
+ require_once "include.inc.php";
if(isset($_GET["redirect"])) {
$redirect = urlencode($_GET["redirect"]);
View
6 php/mail.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$title = translate("E-Mail Photo");
@@ -134,7 +134,7 @@
$from_name = $user->person->getName();
$from_email = $user->person->get_email();
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
@@ -218,5 +218,5 @@
</form>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
6 php/notify.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
@@ -79,7 +79,7 @@
$to_email = $u->person->get_email();
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
@@ -179,5 +179,5 @@
</form>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
8 php/page.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-require_once("include.inc.php");
+require_once "include.inc.php";
$zophpage_id = getvar("page_id");
$zophpage = new page($zophpage_id);
@@ -39,8 +39,8 @@
$obj = &$zophpage;
-require_once("actions.inc.php");
-require_once("header.inc.php");
+require_once "actions.inc.php";
+require_once "header.inc.php";
if ($action == "confirm") {
?>
@@ -106,5 +106,5 @@
<?php
}
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
6 php/pages.php
@@ -16,9 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-require_once("include.inc.php");
+require_once "include.inc.php";
$title=translate("Pages");
-require_once("header.inc.php");
+require_once "header.inc.php";
?>
<h1>
<?php
@@ -38,5 +38,5 @@
<br>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
8 php/pageset.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$pageset_id = getvar("pageset_id");
$pageset = new pageset($pageset_id);
@@ -45,14 +45,14 @@
}
$obj = &$pageset;
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
if ($_action != "new") {
$title = $pageset->get("title");
} else {
$title = translate("Create new pageset");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<?php
if ($action == "confirm") {
@@ -125,5 +125,5 @@
<?php
}
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
6 php/pagesets.php
@@ -15,8 +15,8 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
- require_once("header.inc.php");
+ require_once "include.inc.php";
+ require_once "header.inc.php";
?>
<h1>
<?php
@@ -36,5 +36,5 @@
<br>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
6 php/password.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$userid = getvar("userid");
$password = getvar("password");
@@ -46,7 +46,7 @@
$title = translate("Change Password");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1><?php echo translate("change password") ?></h1>
<div class="main" id="passwordchange">
@@ -80,4 +80,4 @@
?>
</form>
</div>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
6 php/people.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$_view=getvar("_view");
if(empty($_view)) {
$_view=$user->prefs->get("view");
@@ -36,7 +36,7 @@
$_l = "all";
}
$title = translate("People");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<?php
@@ -109,5 +109,5 @@
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
14 php/person.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
$_action = "display";
@@ -39,7 +39,7 @@
$obj = &$person;
$redirect = "people.php";
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
if ($action != "insert") {
$person->lookup();
$title = e($person->getName());
@@ -48,7 +48,7 @@
$title = translate("New Person");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
if ($action == "display") {
$photos_of = $person->getPhotoCount();
$photos_by = $person->getPhotographer()->getPhotoCount();
@@ -77,9 +77,9 @@
</h1>
<?php
if($user->is_admin()) {
- include("selection.inc.php");
+ include "selection.inc.php";
}
- include("show_page.inc.php");
+ include "show_page.inc.php";
if($show_orig) {
?>
<div class="main">
@@ -165,8 +165,8 @@
<?php
}
else {
-require_once("edit_person.inc.php");
+require_once "edit_person.inc.php";
}
?>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
10 php/photo.php
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$photo_id = getvar("photo_id");
$_off = getvar("_off");
@@ -285,7 +285,7 @@
} else {
$title = translate("New Photo");
}
-require_once("header.inc.php");
+require_once "header.inc.php";
// no photo was found and this isn't a new record
if ($action != "insert" && !$found) {
?>
@@ -314,7 +314,7 @@
<?php echo $title_bar ?>
</h1>
<?php
- require_once("selection.inc.php");
+ require_once "selection.inc.php";
?>
<div class="main">
@@ -492,7 +492,7 @@
echo $photo->getImageTag(MID_PREFIX);
}
else {
- require_once("edit_photo.inc.php");
+ require_once "edit_photo.inc.php";
}
?>
</div>
@@ -514,4 +514,4 @@
}
?>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
6 php/photos.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$_cols = (int) getvar("_cols");
@@ -83,7 +83,7 @@
$extrastyle = "body { width: " . $width . "px; }\n";
}
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<span class="actionlink">
@@ -221,4 +221,4 @@
echo $map;
}
?>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
10 php/place.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$place_id = getvar("place_id");
@@ -31,7 +31,7 @@
}
$action="display";
}
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
if (!$user->is_admin() || $action == "display") {
redirect("places.php?parent_place_id=" . $place->get("place_id"), "Redirect");
}
@@ -43,7 +43,7 @@
$title = translate("New Place");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<?php
if ($action == "confirm") {
@@ -58,7 +58,7 @@
<?php
} else {
-require_once("edit_place.inc.php");
+require_once "edit_place.inc.php";
}
?>
</div>
@@ -78,4 +78,4 @@
?>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
10 php/places.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$_view=getvar("_view");
if(empty($_view)) {
@@ -47,7 +47,7 @@
$title = $place->get("parent_place_id") ? $place->get("title") : translate("Places");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
@@ -68,10 +68,10 @@
</h1>
<?php
if ($user->is_admin()) {
- include("selection.inc.php");
+ include "selection.inc.php";
}
$page_html="";
- include("show_page.inc.php");
+ include "show_page.inc.php";
if($show_orig) {
?>
<div class="main">
@@ -215,5 +215,5 @@
} // if show_orig
echo $page_html;
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
6 php/prefs.php
@@ -14,7 +14,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if ($_action == "edit") {
$action = "update";
@@ -34,7 +34,7 @@
$title = translate("Preferences");
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1>
<span class="actionlink"><a href="password.php"><?php echo translate("change password") ?></a></span>
@@ -217,4 +217,4 @@
</form>
</div>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
8 php/relation.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
if (!$user->is_admin()) {
redirect("zoph.php");
@@ -46,7 +46,7 @@
}
$obj = &$relation;
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
if($action=="display") {
@@ -55,7 +55,7 @@
$title=translate($action . " relationship");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
if ($action == "confirm") {
?>
@@ -143,5 +143,5 @@
<?php
}
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
?>
View
2 php/reports.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$tpl=new template("main", array(
"title" => translate("Reports")
View
18 php/search.php
@@ -15,7 +15,7 @@
* along with Zoph; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$title=translate("search",0);
if ($_action=="insert") {
$search=new search();
@@ -34,7 +34,7 @@
if (strtolower($_action) == strtolower(rtrim(translate("search")))) {
$request_vars = clean_request_vars($request_vars);
- require_once("photos.php");
+ require_once "photos.php";
} else if ($_action=="new" || $_action=="edit") {
if($_action=="new") {
$action="insert";
@@ -62,7 +62,7 @@
$search->lookup();
$url=$search->get("search");
}
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1><?php echo translate("Save search")?></h1>
<div class="main">
@@ -76,7 +76,7 @@
</form>
<div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
end;
@@ -84,7 +84,7 @@
$_action=="confirm" ||
$_action=="insert") {
$obj = &$search;
- require_once("actions.inc.php");
+ require_once "actions.inc.php";
redirect("search.php", "Redirect");
} else if ($_action=="delete") {
$search_id=getvar("search_id");
@@ -92,7 +92,7 @@
$search->lookup();
$url="search.php?search_id=" . $search->get("search_id") .
"&_action=confirm";
- require_once("header.inc.php");
+ require_once "header.inc.php";
?>
<h1><?php echo translate("Delete saved search")?></h1>
<div class="main">
@@ -104,13 +104,13 @@
<br>
</div>
<?php
- require_once("footer.inc.php");
+ require_once "footer.inc.php";
end;
} else {
$today = date("Y-m-d");
- require_once("header.inc.php");
+ require_once "header.inc.php";
/*
Each search item is stored in a set of arrays. The increment button increases the size of the array.
@@ -651,7 +651,7 @@
$map->setCenterAndZoom(0,0,2);
echo $map;
}
-require_once("footer.inc.php");
+require_once "footer.inc.php";
}
?>
View
4 php/slideshow.php
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
- require_once("include.inc.php");
+ require_once "include.inc.php";
$_off = getvar("_off");
$_pause = getvar("_pause");
$_random = getvar("_random");
@@ -137,4 +137,4 @@
</dl>
<br>
</div>
-<?php require_once("footer.inc.php"); ?>
+<?php require_once "footer.inc.php"; ?>
View
4 php/templates/default/admin.tpl.php
@@ -20,7 +20,7 @@
*/
if(!ZOPH) { die("Illegal call"); }
-require_once("header.inc.php");
+require_once "header.inc.php";
?>
<h1>
<?php echo $tpl_title; ?>
@@ -38,4 +38,4 @@
<?php endforeach; ?>
</ul>
</div>
- <?php require_once("footer.inc.php"); ?>
+ <?php require_once "footer.inc.php"; ?>
View
4 php/templates/default/config.tpl.php