Fixes: #586 FSF address incorrect in source code and documentation files

contrib/smarty/plugins/block.t.php

@@ -15,15 +15,15 @@
  *                                                                           *
  * You should have received a copy of the GNU Lesser General Public          *
  * License along with this library; if not, write to the Free Software       *
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA *
  * ------------------------------------------------------------------------- *
  *
  * Installation: simply copy this file to the smarty plugins directory.
  *
- * @package	smarty-gettext
- * @version	$Id: block.t.php,v 1.1 2005/07/27 17:58:56 sagi Exp $
- * @link	http://smarty-gettext.sourceforge.net/
- * @author	Sagi Bashari <sagi@boom.org.il>
+ * @package smarty-gettext
+ * @version $Id: block.t.php,v 1.1 2005/07/27 17:58:56 sagi Exp $
+ * @link  http://smarty-gettext.sourceforge.net/
+ * @author  Sagi Bashari <sagi@boom.org.il>
  * @copyright 2004-2005 Sagi Bashari
  */
 
@@ -31,28 +31,28 @@
  * Replaces arguments in a string with their values.
  * Arguments are represented by % followed by their number.
  *
- * @param	string	Source string
- * @param	mixed	Arguments, can be passed in an array or through single variables.
- * @returns	string	Modified string
+ * @param string  Source string
+ * @param mixed Arguments, can be passed in an array or through single variables.
+ * @returns string  Modified string
  */
 function smarty_gettext_strarg($str)
 {
-	$tr = array();
-	$p = 0;
+  $tr = array();
+  $p = 0;
 
-	for ($i=1; $i < func_num_args(); $i++) {
-		$arg = func_get_arg($i);
+  for ($i=1; $i < func_num_args(); $i++) {
+    $arg = func_get_arg($i);
 
-		if (is_array($arg)) {
-			foreach ($arg as $aarg) {
-				$tr['%'.++$p] = $aarg;
-			}
-		} else {
-			$tr['%'.++$p] = $arg;
-		}
-	}
+    if (is_array($arg)) {
+      foreach ($arg as $aarg) {
+        $tr['%'.++$p] = $aarg;
+      }
+    } else {
+      $tr['%'.++$p] = $arg;
+    }
+  }
 
-	return strtr($str, $tr);
+  return strtr($str, $tr);
 }
 
 /**
@@ -75,55 +75,55 @@ function smarty_block_t($params, $text, &$smarty)
   if($text === NULL) {
     return;
   }
-	$text = stripslashes($text);
+  $text = stripslashes($text);
 
-	// set escape mode
-	if (isset($params['escape'])) {
-		$escape = $params['escape'];
-		unset($params['escape']);
-	}
+  // set escape mode
+  if (isset($params['escape'])) {
+    $escape = $params['escape'];
+    unset($params['escape']);
+  }
 
-	// set plural version
-	if (isset($params['plural'])) {
-		$plural = $params['plural'];
-		unset($params['plural']);
+  // set plural version
+  if (isset($params['plural'])) {
+    $plural = $params['plural'];
+    unset($params['plural']);
 
-		// set count
-		if (isset($params['count'])) {
-			$count = $params['count'];
-			unset($params['count']);
-		}
-	}
+    // set count
+    if (isset($params['count'])) {
+      $count = $params['count'];
+      unset($params['count']);
+    }
+  }
 
-	// use plural if required parameters are set
-	if (isset($count) && isset($plural)) {
-		$text = ngettext($text, $plural, $count);
-	} else { // use normal
-		$text = gettext($text);
-	}
+  // use plural if required parameters are set
+  if (isset($count) && isset($plural)) {
+    $text = ngettext($text, $plural, $count);
+  } else { // use normal
+    $text = gettext($text);
+  }
 
-	// run strarg if there are parameters
-	if (count($params)) {
-		$text = smarty_gettext_strarg($text, $params);
-	}
+  // run strarg if there are parameters
+  if (count($params)) {
+    $text = smarty_gettext_strarg($text, $params);
+  }
 
-	if (!isset($escape) || $escape == 'html') { // html escape, default
-	   $text = nl2br(htmlspecialchars($text));
+  if (!isset($escape) || $escape == 'html') { // html escape, default
+     $text = nl2br(htmlspecialchars($text));
    } elseif (isset($escape)) {
-		switch ($escape) {
-			case 'javascript':
-			case 'js':
-				// javascript escape
-				$text = str_replace('\'', '\\\'', stripslashes($text));
-				break;
-			case 'url':
-				// url escape
-				$text = urlencode($text);
-				break;
-		}
-	}
+    switch ($escape) {
+      case 'javascript':
+      case 'js':
+        // javascript escape
+        $text = str_replace('\'', '\\\'', stripslashes($text));
+        break;
+      case 'url':
+        // url escape
+        $text = urlencode($text);
+        break;
+    }
+  }
 
-	return $text;
+  return $text;
 }
 
 ?>