Use __DIR__.

baso10 · Mar 17, 2012 · c7a784a · c7a784a
1 parent fcd5289
commit c7a784a
Show file tree

Hide file tree

Showing 1,288 changed files with 1,985 additions and 1,985 deletions.
diff --git a/agora/ban.php b/agora/ban.php
@@ -8,7 +8,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Make sure we have a forum id. */

diff --git a/agora/deleteforum.php b/agora/deleteforum.php
@@ -11,7 +11,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the forums object. */

diff --git a/agora/editforum.php b/agora/editforum.php
@@ -10,7 +10,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the forums object. */

diff --git a/agora/forums.php b/agora/forums.php
@@ -11,7 +11,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the forums object. */

diff --git a/agora/index.php b/agora/index.php
@@ -1,3 +1,3 @@
 <?php
 
-require dirname(__FILE__) . '/forums.php';
+require __DIR__ . '/forums.php';
diff --git a/agora/lib/Application.php b/agora/lib/Application.php
@@ -17,7 +17,7 @@
 
 /* Determine the base directories. */
 if (!defined('AGORA_BASE')) {
-    define('AGORA_BASE', dirname(__FILE__) . '/..');
+    define('AGORA_BASE', __DIR__ . '/..');
 }
 
 if (!defined('HORDE_BASE')) {

diff --git a/agora/messages/abuse.php b/agora/messages/abuse.php
@@ -8,7 +8,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/messages/delete.php b/agora/messages/delete.php
@@ -10,7 +10,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/messages/edit.php b/agora/messages/edit.php
@@ -13,7 +13,7 @@
 
 /* TODO total message count doesn't increase in forum and threads view
  * (cache problem) */
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 list($forum_id, $message_id, $scope) = Agora::getAgoraId();

diff --git a/agora/messages/index.php b/agora/messages/index.php
@@ -10,7 +10,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/messages/lock.php b/agora/messages/lock.php
@@ -10,7 +10,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/messages/merge.php b/agora/messages/merge.php
@@ -8,7 +8,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/messages/move.php b/agora/messages/move.php
@@ -8,7 +8,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/messages/split.php b/agora/messages/split.php
@@ -8,7 +8,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/moderate.php b/agora/moderate.php
@@ -8,7 +8,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the messages object. */

diff --git a/agora/moderators.php b/agora/moderators.php
@@ -11,7 +11,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 if (!$registry->isAdmin()) {

diff --git a/agora/owner.php b/agora/owner.php
@@ -10,7 +10,7 @@
  * @author Duck  <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Default to agora and current user if is not an admin. */

diff --git a/agora/rss/index.php b/agora/rss/index.php
@@ -8,7 +8,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora', array('authentication' => 'none'));
 
 // Show a specific scope?

diff --git a/agora/rss/messages.php b/agora/rss/messages.php
@@ -8,7 +8,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora', array('authentication' => 'none'));
 
 // Show a specific scope?

diff --git a/agora/rss/threads.php b/agora/rss/threads.php
@@ -8,7 +8,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora', array('authentication' => 'none'));
 
 // Detect forum id

diff --git a/agora/scripts/phorum2agora.php b/agora/scripts/phorum2agora.php
@@ -15,7 +15,7 @@
  * TODO: Moderation, attachments, ID swaping
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('agora', array('cli' => true));
 
 /* Open Agora database. */

diff --git a/agora/search.php b/agora/search.php
@@ -10,7 +10,7 @@
  * @author  Jason Felice <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Set up the forums object. */

diff --git a/agora/threads.php b/agora/threads.php
@@ -11,7 +11,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 /* Make sure we have a forum id. */

diff --git a/agora/view.php b/agora/view.php
@@ -10,7 +10,7 @@
  * @author Marko Djukic <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('agora');
 
 $action_id = Horde_Util::getFormData('action_id', 'download');

diff --git a/ansel/bin/ansel b/ansel/bin/ansel
@@ -11,8 +11,8 @@
 *
 * @author Michael J. Rubinsky <[email protected]>
 */
-if (file_exists(dirname(__FILE__) . '/../../ansel/lib/Application.php')) {
-    $baseDir = dirname(__FILE__) . '/../';
+if (file_exists(__DIR__ . '/../../ansel/lib/Application.php')) {
+    $baseDir = __DIR__ . '/../';
 } else {
     require_once 'PEAR/Config.php';
     $baseDir = PEAR_Config::singleton()

diff --git a/ansel/bin/ansel-convert-sql-shares-to-sqlng b/ansel/bin/ansel-convert-sql-shares-to-sqlng
@@ -10,8 +10,8 @@
  * the NG driver at a later time.
  */
 
-if (file_exists(dirname(__FILE__) . '/../../ansel/lib/Application.php')) {
-    $baseDir = dirname(__FILE__) . '/../';
+if (file_exists(__DIR__ . '/../../ansel/lib/Application.php')) {
+    $baseDir = __DIR__ . '/../';
 } else {
     require_once 'PEAR/Config.php';
     $baseDir = PEAR_Config::singleton()

diff --git a/ansel/bin/ansel-exif-to-tags b/ansel/bin/ansel-exif-to-tags
@@ -8,8 +8,8 @@
 *
 * @author Michael J. Rubinsky <[email protected]>
 */
-if (file_exists(dirname(__FILE__) . '/../../ansel/lib/Application.php')) {
-    $baseDir = dirname(__FILE__) . '/../';
+if (file_exists(__DIR__ . '/../../ansel/lib/Application.php')) {
+    $baseDir = __DIR__ . '/../';
 } else {
     require_once 'PEAR/Config.php';
     $baseDir = PEAR_Config::singleton()

diff --git a/ansel/bin/ansel-garbage-collection b/ansel/bin/ansel-garbage-collection
@@ -13,8 +13,8 @@
  * @pacakge Ansel
  */
 
-if (file_exists(dirname(__FILE__) . '/../../ansel/lib/Application.php')) {
-    $baseDir = dirname(__FILE__) . '/../';
+if (file_exists(__DIR__ . '/../../ansel/lib/Application.php')) {
+    $baseDir = __DIR__ . '/../';
 } else {
     require_once 'PEAR/Config.php';
     $baseDir = PEAR_Config::singleton()

diff --git a/ansel/browse.php b/ansel/browse.php
@@ -6,7 +6,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $layout = new Horde_Core_Block_Layout_View(

diff --git a/ansel/browse_edit.php b/ansel/browse_edit.php
@@ -6,7 +6,7 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $blocks = $injector->getInstance('Horde_Core_Factory_BlockCollection')->create(array('ansel'), 'myansel_layout');

diff --git a/ansel/disclamer.php b/ansel/disclamer.php
@@ -8,7 +8,7 @@
  * @author Jan Zagar <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $vars = Horde_Variables::getDefaultVariables();

diff --git a/ansel/edit_dates.php b/ansel/edit_dates.php
@@ -8,7 +8,7 @@
  * @author Michael J. Rubinsky <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $images = Horde_Util::getFormData('image', array());

diff --git a/ansel/faces/claim.php b/ansel/faces/claim.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $faces = $GLOBALS['injector']->getInstance('Ansel_Faces');

diff --git a/ansel/faces/custom.php b/ansel/faces/custom.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $image_id = (int)Horde_Util::getFormData('image');

diff --git a/ansel/faces/face.php b/ansel/faces/face.php
@@ -13,7 +13,7 @@
  *
  * @author Duck <[email protected]>
  */
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $faces = $GLOBALS['injector']->getInstance('Ansel_Faces');

diff --git a/ansel/faces/gallery.php b/ansel/faces/gallery.php
@@ -12,7 +12,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $gallery_id = (int)Horde_Util::getFormData('gallery');

diff --git a/ansel/faces/image.php b/ansel/faces/image.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $faces = $GLOBALS['injector']->getInstance('Ansel_Faces');

diff --git a/ansel/faces/img.php b/ansel/faces/img.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $face_id = Horde_Util::getFormData('face');

diff --git a/ansel/faces/name.php b/ansel/faces/name.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $image_id = (int)Horde_Util::getFormData('image');

diff --git a/ansel/faces/report.php b/ansel/faces/report.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $face_id = Horde_Util::getFormData('face');

diff --git a/ansel/faces/savecustom.php b/ansel/faces/savecustom.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../lib/Application.php';
+require_once __DIR__ . '/../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $image_id = (int)Horde_Util::getFormData('image_id');

diff --git a/ansel/faces/search/img.php b/ansel/faces/search/img.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../../lib/Application.php';
+require_once __DIR__ . '/../../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $thumb = Horde_Util::getGet('thumb');

diff --git a/ansel/faces/search/tabs.php b/ansel/faces/search/tabs.php
@@ -10,7 +10,7 @@
  * @author Duck <[email protected]>
  */
 
-require_once dirname(__FILE__) . '/../../lib/Application.php';
+require_once __DIR__ . '/../../lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 $faces = $GLOBALS['injector']->getInstance('Ansel_Faces');

diff --git a/ansel/gallery.php b/ansel/gallery.php
@@ -10,7 +10,7 @@
  * @package Ansel
  */
 
-require_once dirname(__FILE__) . '/lib/Application.php';
+require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('ansel');
 
 // Redirect to the gallery list if no action has been requested.