[geeklog-cvs] tools/lm lm.php,1.4,1.5 uplng.sh,1.6,1.7

[Dirk Haun]

Update of /cvsroot/geeklog/tools/lm
In directory qs1489.pair.com:/tmp/cvs-serv80947

Modified Files:
	lm.php uplng.sh 
Log Message:
Added module to update the Spam-X plugin language files


Index: lm.php
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/lm.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lm.php	27 Apr 2008 17:11:13 -0000	1.4
--- lm.php	27 Apr 2008 20:27:56 -0000	1.5
***************
*** 59,63 ****
          echo "Sorry, this script needs a PHP version that has multibyte support compiled in.\n\n";
          exit;
!     } else if (!function_exists('mb_ereg_replace')) {
          echo "Sorry, this script needs a PHP version with the mb_ereg_replace function compiled in.\n\n";
          exit;
--- 59,63 ----
          echo "Sorry, this script needs a PHP version that has multibyte support compiled in.\n\n";
          exit;
!     } elseif (!function_exists('mb_ereg_replace')) {
          echo "Sorry, this script needs a PHP version with the mb_ereg_replace function compiled in.\n\n";
          exit;
***************
*** 139,146 ****
  
  /**
! * Replace <br> with '<br . XHTML . >' construct for XHTML compliance
  *
  */
! function patch_br($txt)
  {
      global $mb;
--- 139,146 ----
  
  /**
! * Make <br> and <hr> tags XHTML compliant
  *
  */
! function makeXHTML($txt)
  {
      global $mb;
***************
*** 152,157 ****
      }
  
!     return my_str_replace('<br>',
                            '<br' . $fc . ' . XHTML . ' . $fc . '>', $txt);
  }
  
--- 152,161 ----
      }
  
!     $txt = my_str_replace('<br>',
                            '<br' . $fc . ' . XHTML . ' . $fc . '>', $txt);
+     $txt = my_str_replace('<hr>',
+                           '<hr' . $fc . ' . XHTML . ' . $fc . '>', $txt);
+ 
+     return $txt;
  }
  
***************
*** 246,252 ****
                  if ($ntxt === true) {
                      $quotedtext .= 'true';
!                 } else if ($ntxt === false) {
                      $quotedtext .= 'false';
!                 } else if (is_numeric($ntxt)) {
                      $quotedtext .= $ntxt;
                  } else {
--- 250,256 ----
                  if ($ntxt === true) {
                      $quotedtext .= 'true';
!                 } elseif ($ntxt === false) {
                      $quotedtext .= 'false';
!                 } elseif (is_numeric($ntxt)) {
                      $quotedtext .= $ntxt;
                  } else {
***************
*** 272,276 ****
          }
  
!         $quotedtext = patch_br($quotedtext);
  
          if ($counter != $numElements) {
--- 276,280 ----
          }
  
!         $quotedtext = makeXHTML($quotedtext);
  
          if ($counter != $numElements) {
***************
*** 298,302 ****
  
      $quotedtext = prepareText($newtxt);
!     $quotedtext = patch_br($quotedtext);
  
      echo "\$$name = $quotedtext;\n";
--- 302,306 ----
  
      $quotedtext = prepareText($newtxt);
!     $quotedtext = makeXHTML($quotedtext);
  
      echo "\$$name = $quotedtext;\n";
***************
*** 323,330 ****
--- 327,341 ----
                      // end of credits reached
                      break;
+                 } elseif (strstr($line, '*/') !== false) {
+                     // end of credits reached, Spam-X style
+                     break;
                  }
              } else {
                  if (strstr ($line, '#####') !== false) {
                      // start of credits
+                     $firstcomment = true;
+                     $credits[] = $line;
+                 } elseif (strstr($line, '/**') !== false) {
+                     // start of credits, Spam-X style
                      $firstcomment = true;
                      $credits[] = $line;

Index: uplng.sh
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/uplng.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** uplng.sh	27 Apr 2008 19:04:50 -0000	1.6
--- uplng.sh	27 Apr 2008 20:27:56 -0000	1.7
***************
*** 87,90 ****
--- 87,91 ----
  doConvert $destpath $cvspath "calendar"
  doConvert $destpath $cvspath "polls"
+ doConvert $destpath $cvspath "spamx"
  doConvert $destpath $cvspath "staticpages"