phpslash-commit Mailing List for phpSlash (Page 41)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpslash/phpslash-dev/include/modules/story
In directory sc8-pr-cvs1:/tmp/cvs-serv27702/phpslash-dev/include/modules/story

Modified Files:
	Story.class Story_admin.class Story_base.class 
Log Message:
New Feature - Story plugins added.

Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Story.class	6 Nov 2003 19:15:11 -0000	1.6
--- Story.class	11 Nov 2003 20:50:07 -0000	1.7
***************
*** 270,280 ****
  	  
                 default:
! 	       
! 	               // pluggable user defined function
!                   if ($this->psl['story_options_udf'] != '') {
!                      $ary = $this->psl['story_options_udf']($key,$ary['story_options'][$key] , $ary);
                    }
-                   // let the template parse any story options left over.
-                   $this->template->set_var(array(strtoupper($key) => $ary['story_options'][$key]));
                    $ary['story_options'][$key] = '';
                    // what is left over?
--- 270,288 ----
  	  
                 default:
! 	      
!                   $this->story_plugin['type'] = $ary['story_options'][$key];
!                   // attempt to handle any plugins and if not there proceed
!                   // yes - one equal sign
!                   if($parsed = $this->doParse($ary)) {
!                      $ary = $parsed;
!                   } else {
! 	                  // pluggable user defined function
!                      if ($this->psl['story_options_udf'] != '') {
!                         $ary = $this->psl['story_options_udf']($key,$ary['story_options'][$key] , $ary);
!                      }
!                      // let the template parse any story options left over.
!                      $this->template->set_var(array(strtoupper($key) => $ary['story_options'][$key]));
! 
                    }
                    $ary['story_options'][$key] = '';
                    // what is left over?

Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story_admin.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Story_admin.class	1 Jul 2003 03:51:41 -0000	1.4
--- Story_admin.class	11 Nov 2003 20:50:07 -0000	1.5
***************
*** 195,199 ****
        if ($this->template->get_var("row") == "") {
           $this->template->set_block("printStory","row","rows");
! 	 $this->template->set_block("printStory","alsotext","alsoblock");
        }
  
--- 195,199 ----
        if ($this->template->get_var("row") == "") {
           $this->template->set_block("printStory","row","rows");
! 	      $this->template->set_block("printStory","alsotext","alsoblock");
        }
  
***************
*** 258,274 ****
        //debug( "Story_admin.class::showStory::ary",$ary );
        
!       # set the formatting options for display only
!       if ($ary['content'] == "exttrans") {
!          $ary['intro_text'] = htmlentities($ary['intro_text']);
!          $ary['body_text'] = htmlentities($ary['body_text']);
!       }
  
-       if ($ary['content'] == "plain" or $ary['content'] == "exttrans") {
-          $ary['intro_text'] = nl2br($ary['intro_text']);
-          $ary['intro_text'] = ereg_replace("<br><br>","<br>",$ary['intro_text']);
-          $ary['body_text'] = nl2br($ary['body_text']);
-          $ary['body_text'] = ereg_replace("<br><br>","<br>",$ary['body_text']); 
        }
  
  
        $this->template->set_var(array(
--- 258,320 ----
        //debug( "Story_admin.class::showStory::ary",$ary );
        
!       $optionname_ary = $ary['optionname'];
!       $optionval_ary = $ary['optionval'];
! 
!       $count = count($ary['optionname']);
!       for( $i=0 ; $i < $count ; $i++) {
! 
!          if(  $optionname_ary[$i] != "") {
! 	         $optname = $optionname_ary[$i];
! 	         $optval  = $optionval_ary[$i];
! 	         $story_options_ary[$optname] = $optval;
! 	      }
  
        }
+       // debug("story_options_ary", $story_options_ary);
+       $ary['story_options'] = $story_options_ary;
+       
+       if (is_array($ary['story_options'])) {
+          while( list( $key, $val) = @each( $ary['story_options'] )) {
+            
+             switch($key) {
+                
+ 	            case "tpl":
+ 	               // debug("Story::getStory::story_option[$key]", $val);
+ 		            $tpl = $ary['story_options'][$key];
+                   $ary['story_options'][$key] = '';
+ 		            break;
+ 
+                /*  Stub for future needs.
+                case "example":
+ 	               debug("Story::getStory::story_option[$key]", $val);
+                   $ary['story_options'][$key] = '';
+ 		            break;
+                */
+ 	  
+                default:
+ 	      
+                   $this->story_plugin['type'] = $ary['story_options'][$key];
+                   // attempt to handle the requested plugin 
+                   //   and if not there proceed
+                   // yes - one equal sign
+                   if($parsed = $this->doParse($ary)) {
+                      $ary = $parsed;
+                   } else {
+ 	                  // pluggable user defined function
+                      if ($this->psl['story_options_udf'] != '') {
+                         $ary = $this->psl['story_options_udf']($key,$ary['story_options'][$key] , $ary);
+                      }
+                      // let the template parse any story options left over.
+                      $this->template->set_var(array(strtoupper($key) => $ary['story_options'][$key]));
  
+                   }
+                   $ary['story_options'][$key] = '';
+                   // what is left over?
+                   // debug("block_options[$key]", $val);
+                   break;
+  
+ 	         }
+ 	      }
+       }
  
        $this->template->set_var(array(
***************
*** 713,730 ****
           $this->template->set_var('OPTIONS', $options);
  
- 	      if ($ary['content'] == "plain") {
-             $this->template->set_var('PLAIN_CHKBOX',"CHECKED");
-             $this->template->set_var('HTML_CHKBOX',"");
-             $this->template->set_var('EXTTRANS_CHKBOX',"");
-          } elseif ($ary['content'] == "exttrans") {
-             $this->template->set_var('PLAIN_CHKBOX',"");
-             $this->template->set_var('HTML_CHKBOX',"");
-             $this->template->set_var('EXTTRANS_CHKBOX',"CHECKED");
-          } else {
-             $this->template->set_var('PLAIN_CHKBOX',"");
-             $this->template->set_var('HTML_CHKBOX',"CHECKED");
-             $this->template->set_var('EXTTRANS_CHKBOX',"");
-          }
-          
           $topic_ary   = array();
           if(array_key_exists('topic_id_ary', $ary)) {
--- 759,762 ----
***************
*** 982,986 ****
           }
        }
!       $options = displayOptions('story', $this->template, "newstory", '');
        $this->template->set_var('OPTIONS', $options);
  
--- 1014,1018 ----
           }
        }
!       $options = displayOptions('story', $this->template, "newstory", $temparray);
        $this->template->set_var('OPTIONS', $options);
  

Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story_base.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Story_base.class	1 Jul 2003 03:50:50 -0000	1.7
--- Story_base.class	11 Nov 2003 20:50:07 -0000	1.8
***************
*** 572,575 ****
--- 572,623 ----
  
        }
+ 
+       $ary['story_options'] = $story_options_ary;
+       
+       if (is_array($ary['story_options'])) {
+          while( list( $key, $val) = @each( $ary['story_options'] )) {
+            
+             switch($key) {
+                
+ 	            case "tpl":
+ 	               // debug("Story::getStory::story_option[$key]", $val);
+ 		            $tpl = $ary['story_options'][$key];
+                   $ary['story_options'][$key] = '';
+ 		            break;
+ 
+                /*  Stub for future needs.
+                case "example":
+ 	               debug("Story::getStory::story_option[$key]", $val);
+                   $ary['story_options'][$key] = '';
+ 		            break;
+                */
+ 	  
+                default:
+ 	      
+                   $this->story_plugin['type'] = $ary['story_options'][$key];
+                   // attempt to handle the requested plugin 
+                   //   and if not there proceed
+                   // yes - one equal sign
+                   if($parsed = $this->doParse($ary)) {
+                      $ary = $parsed;
+                   } else {
+ 	                  // pluggable user defined function
+                      if ($this->psl['story_options_udf'] != '') {
+                         $ary = $this->psl['story_options_udf']($key,$ary['story_options'][$key] , $ary);
+                      }
+                      // let the template parse any story options left over.
+                      $this->template->set_var(array(strtoupper($key) => $ary['story_options'][$key]));
+ 
+                   }
+                   $ary['story_options'][$key] = '';
+                   // what is left over?
+                   // debug("block_options[$key]", $val);
+                   break;
+  
+ 	         }
+ 	      }
+ 
+       }
+       // debug("story_options_ary", $story_options_ary);
        $serial_opts=addslashes(serialize($story_options_ary));
  
***************
*** 614,631 ****
           // echo "<B>STORY ID:  $ary[story_id]</B><BR><BR>\n";
  
-          # set the formatting options for new submissions only
-          if ($ary['content'] == "exttrans") {
-             $ary['intro_text'] = htmlentities($ary['intro_text']);
-             $ary['body_text'] = htmlentities($ary['body_text']);
-          }
- 
-          if ($ary['content'] == "plain" or $ary['content'] == "exttrans") {
-             $ary['intro_text'] = nl2br($ary['intro_text']);
-             $ary['intro_text'] = ereg_replace("<br><br>","<br>",$ary['intro_text']);
-             $ary['body_text'] = nl2br($ary[body_text]);
-             $ary['body_text'] = ereg_replace("<br><br>","<br>",$ary['body_text']);
-          }
- 
- 
           $q  = "INSERT INTO psl_story
                             (story_id,
--- 662,665 ----
***************
*** 787,790 ****
--- 821,885 ----
     }
  
+    /**
+    * getParser -  get parser method for Story_plugin type
+    *             
+    * @param string mytpe
+    * 
+    * @access private 
+    *
+    * return object this->parser 
+    */
+    function getParser($mytype) {
+ 
+       /* Start a new object to render info */
+       $parserName  = "Story_plugin_" . $mytype;
+       $parserFile  = $parserName . ".class";
+       $parserPath  = $this->psl['moduledir'] ."/story/plugins/". $parserFile;
+       // debug("Story::getParser::parserName",$parserPath);
+ 
+       // bail out if the file doesn't exist
+       if(!file_exists($parserPath)) {
+          return false;
+       }
+       // register the class
+       AddClassRequirement($parserName,"story_plugin_i");
+       AddClassRequirement($parserName,$parserPath);
+ 
+       static $parser_arr;
+ 
+       if( empty($parser_arr[$mytype])) {
+ 	      $parser_arr[$mytype] = pslNew($parserName);
+       }
+       $this->parser = $parser_arr[$mytype];
+       return $parser_arr[$mytype];
+    }
+ 
+    /**
+    * doParse - parse the requested plugin, returning success status.
+    *           storage is done in the story_ary data array.
+    *             
+    * 
+    * @access private 
+    *
+    * return boolean success 
+    */
+    function doParse($ary) {
+       
+       if ($this->getParser($this->story_plugin['type'])) {
+          // $thistype = $this->story_plugin['type'];
+          $status = $this->parser->parse($ary);
+          // debug("status", $status);
+          $this->parsedData = $this->parser->getFinal();
+          // only copy the parsed data if it changed
+          if($ary != $this->parsedData) {
+             $ary = $this->parsedData;
+          }
+          return $ary;
+       } else {
+          // parser/plugin not found
+          // debug("Story_base::doParse::type", $this->story_plugin["type"]);
+          return false;
+       }
+    }
  
  }     // end of Story_base

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (11)	Nov (59)	Dec (60)
2002	Jan (52)	Feb (77)	Mar (118)	Apr (76)	May (106)	Jun (145)	Jul (9)	Aug (15)	Sep (78)	Oct (83)	Nov (105)	Dec (51)
2003	Jan (105)	Feb (100)	Mar (111)	Apr (149)	May (95)	Jun (56)	Jul (8)	Aug (2)	Sep	Oct (22)	Nov (117)	Dec (6)
2004	Jan (1)	Feb	Mar (3)	Apr (25)	May	Jun (11)	Jul (26)	Aug (85)	Sep (119)	Oct (312)	Nov (271)	Dec (5)
2005	Jan (6)	Feb	Mar	Apr (12)	May (7)	Jun (8)	Jul	Aug	Sep	Oct	Nov	Dec
2009	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

phpslash-commit Mailing List for phpSlash (Page 41)

phpslash-commit — A list for automatically mailed SCM Commits