[geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.22, 1.23

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv20688/system/classes

Modified Files:
	story.class.php 
Log Message:
Final fixes for HTML story processing.

Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** story.class.php	19 Feb 2008 17:47:30 -0000	1.22
--- story.class.php	20 Feb 2008 17:47:25 -0000	1.23
***************
*** 1500,1511 ****
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[raw]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded;
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos);
!                         $buffer = MBYTE_substr($buffer, $end_pos);
                      } else { // missing [/raw]
                          // Treat the remainder as code, but this should have been
--- 1500,1511 ----
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[/raw]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded . '[/raw]';
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos + 6);
!                         $buffer = MBYTE_substr($buffer, $end_pos + 6);
                      } else { // missing [/raw]
                          // Treat the remainder as code, but this should have been
***************
*** 1514,1518 ****
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($linlower, '[raw]');
                  }
                  // Append remainder:
--- 1514,1518 ----
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($inlower, '[raw]');
                  }
                  // Append remainder:
***************
*** 1534,1545 ****
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[code]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded;
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos);
!                         $buffer = MBYTE_substr($buffer, $end_pos);
                      } else { // missing [/code]
                          // Treat the remainder as code, but this should have been
--- 1534,1545 ----
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[/code]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded . '[/code]';
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos + 7);
!                         $buffer = MBYTE_substr($buffer, $end_pos + 7);
                      } else { // missing [/code]
                          // Treat the remainder as code, but this should have been
***************
*** 1548,1552 ****
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($linlower, '[code]');
                  }
                  // Append remainder:
--- 1548,1552 ----
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($inlower, '[code]');
                  }
                  // Append remainder: