cvs: pearweb /public_html captcha-image.php

pajoye          Mon Feb 20 02:03:50 2006 UTC

  Modified files:              
    /pearweb/public_html        captcha-image.php 
  Log:
  - path independent font dir definition... 
  
  
http://cvs.php.net/viewcvs.cgi/pearweb/public_html/captcha-image.php?r1=1.12&r2=1.13&diff_format=u
Index: pearweb/public_html/captcha-image.php
diff -u pearweb/public_html/captcha-image.php:1.12 
pearweb/public_html/captcha-image.php:1.13
--- pearweb/public_html/captcha-image.php:1.12  Sun Sep 11 10:11:14 2005
+++ pearweb/public_html/captcha-image.php       Mon Feb 20 02:03:50 2006
@@ -42,7 +42,7 @@
  * @author    Daniel Convissor <danielc@xxxxxxx>
  * @copyright Copyright (c) 2004-2005 The PHP Group
  * @license   http://www.php.net/license/3_0.txt  PHP License
- * @version   $Id: captcha-image.php,v 1.12 2005/09/11 10:11:14 pajoye Exp $
+ * @version   $Id: captcha-image.php,v 1.13 2006/02/20 02:03:50 pajoye Exp $
  * @see       generate_captcha(), validate_captcha()
  */
 
@@ -68,13 +68,7 @@
 $font_size_max    = 25;
 $font_size_min    = 18;
 
-/*
- * Use full path to the fonts to avoid problems.
- * The fonts are located in pearweb/include/fonts.
- * Ease dev box configuration by doing this funky string replace.
- */
-$font_dir = strtr($_SERVER['DOCUMENT_ROOT'],
-                  array('public_html' => 'include')) . '/fonts/';
+$font_dir = realpath(dirname(__FILE__) . '/../include/fonts/') . '/';
 
 /*
  * This array contains the list of font names and the number the base