Changeset 2097

Timestamp:

03/04/10 23:34:40 (14 years ago)

Author:

Oaz

Message:

Implemented tickets 413 (definition of field inside block) and 414 (WidgetTextIf?, WidgetTextLike?, WidgetTextMatch?, WidgetTextNotLike?)

Location:

plugins/templateWidget/trunk

Files:

• _public.php (modified) (2 diffs)
• default-templates/demo.widget.html (modified) (3 diffs)
• inc/class.SettingsList.php (modified) (2 diffs)
• inc/class.WidgetBuilder.php (modified) (6 diffs)

plugins/templateWidget/trunk/_public.php

@@ -33 +33 @@
 
 $core->tpl->addValue('WidgetText',array('templateWidgetBlocksAndValues','Text'));
+$core->tpl->addBlock('WidgetTextIf',array('templateWidgetBlocksAndValues','TextIf'));
+$core->tpl->addBlock('WidgetTextLike',array('templateWidgetBlocksAndValues','TextLike'));
+$core->tpl->addValue('WidgetTextMatch',array('templateWidgetBlocksAndValues','TextMatch'));
+$core->tpl->addBlock('WidgetTextNotLike',array('templateWidgetBlocksAndValues','TextNotLike'));
 $core->tpl->addBlock('WidgetCheckboxIf',array('templateWidgetBlocksAndValues','CheckboxIf'));
 $core->tpl->addBlock('WidgetComboIf',array('templateWidgetBlocksAndValues','ComboIf'));
@@ -111 +115 @@
     return '<?php print html::escapeHTML($_ctx->widget->'.$attr['name'].'); ?>'.CRLF;
   }
-  
+   
+  // Widget text field : testing text value
+  public static function TextIf($attr,$content) {
+          return
+          '<?php if ($_ctx->widget->'.$attr['name'].' == "'.addslashes($attr['value']).'") : ?>'.CRLF.
+               $content.
+          '<?php endif; ?>'.CRLF;
+  }
+   
+  // Widget text field : matching text value against pattern
+  public static function TextLike($attr,$content) {
+          return
+          '<?php if( preg_match( "'.addslashes($attr['pattern']).'", $_ctx->widget->'.$attr['name'].', $widgetTextMatches ) ) : ?>'.CRLF.
+          '<?php $_ctx->widgetTextMatches=$widgetTextMatches; ?>'.CRLF.
+               $content.
+          '<?php endif; ?>'.CRLF;
+  }
+  
+  // Widget text field : displaying part of matched pattern
+  public static function TextMatch($attr) {
+    return '<?php print html::escapeHTML($_ctx->widgetTextMatches['.$attr['index'].']); ?>'.CRLF;
+  }
+   
+  // Widget text field : matching text value against pattern
+  public static function TextNotLike($attr,$content) {
+          return
+          '<?php if( !preg_match( "'.addslashes($attr['pattern']).'", $_ctx->widget->'.$attr['name'].' ) ) : ?>'.CRLF.
+               $content.
+          '<?php endif; ?>'.CRLF;
+  }
+ 
   // Widget checkbox field
   public static function CheckboxIf($attr,$content) {

plugins/templateWidget/trunk/default-templates/demo.widget.html

@@ -4 +4 @@
 <div>
 <h2>{{tpl:WidgetText name="title" title="Title:" default="Default Title" order="1"}}</h2>
+<tpl:WidgetTextLike name="subtitle" title="Subtitle:" order="2" pattern="/---+/">
+<hr/>
+</tpl:WidgetTextLike>
+<tpl:WidgetTextLike name="subtitle" pattern="/bold:(.+)/">
+<b>{{tpl:WidgetTextMatch index="1"}}</b>
+</tpl:WidgetTextLike>
+<tpl:WidgetTextNotLike name="subtitle" pattern="/(---+|bold:(.+))/">
+{{tpl:WidgetText name="subtitle"}}
+</tpl:WidgetTextNotLike>
 
 <tpl:WidgetDefineBlock name="DemoBlock">
 {{tpl:WidgetText name="desc" title="Description:" default="Blah blah..." type="textarea" order="5"}}
-{{tpl:WidgetCombo name="choice" title="Choose:" default="blue" options="red:green:blue" order="4"}}
+{{tpl:WidgetCombo name="choice" title="Choose:" default="blue" options="red:green:blue" order="6"}}
 <tpl:WidgetComboIf name="choice" value="green">
 --This is green
@@ -13 +22 @@
 </tpl:WidgetDefineBlock>
 
-<tpl:WidgetCheckboxIf name="checkme" value="1" title="Check me" default="0" order="2">
+<tpl:WidgetCheckboxIf name="checkme" value="1" title="Check me" default="0" order="3">
 <h3>CheckMe is checked !</h3>
 {{tpl:WidgetUseBlock name="DemoBlock"}}
@@ -21 +30 @@
 </tpl:WidgetCheckboxIf>
 
-<tpl:WidgetCheckboxIf name="uncheckme" value="0" title="Uncheck me" default="1" order="3">
+<tpl:WidgetCheckboxIf name="uncheckme" value="0" title="Uncheck me" default="1" order="4">
 <h3>UncheckMe is not checked!</h3>
 {{tpl:WidgetUseBlock name="DemoBlock"}}

plugins/templateWidget/trunk/inc/class.SettingsList.php

@@ -21 +21 @@
   private $items;
   private $namespace;
+  private $settingsNamespace;
   private $listKey;
   private $class;
@@ -30 +31 @@
     global $core;
     $this->namespace = $namespace;
+    $this->settingsNamespace = $core->blog->settings->addNamespace($namespace);
     $this->listKey = $listKey;
     $this->itemKey = $itemKey;
     $this->httpTypes = $httpTypes;
     $this->class = new ReflectionClass($class);
-    $core->blog->settings->setNameSpace($namespace);
-    if( $core->blog->settings->$listKey === null ) {
+    if( $this->settingsNamespace->$listKey === null ) {
       $this->items = array();
     } else {
-      $this->items = @unserialize(base64_decode($core->blog->settings->$listKey));
+      $this->items = @unserialize(base64_decode($this->settingsNamespace->$listKey));
     }
   }
     
   public function Store() {
-    global $core;
-    $core->blog->settings->setNameSpace($this->namespace);
-    $core->blog->settings->put($this->listKey,base64_encode(serialize($this->items))); // put in blog local settings
+    $this->settingsNamespace->put($this->listKey,base64_encode(serialize($this->items))); // put in blog local settings
   }
  

plugins/templateWidget/trunk/inc/class.WidgetBuilder.php

@@ -43 +43 @@
 
     $this->setPath(
-      $core->blog->themes_path.'/'.$core->blog->settings->theme.'/tpl',
+      $core->blog->themes_path.'/'.$core->blog->settings->system->theme.'/tpl',
       $core->blog->themes_path.'/default/tpl',
       path::real(dirname(__FILE__).'/../default-templates'),
@@ -49 +49 @@
     );
           
-          $this->remove_php = !$core->blog->settings->tpl_allow_php;
-          $this->use_cache = $core->blog->settings->tpl_use_cache;
+          $this->remove_php = !$core->blog->settings->system->tpl_allow_php;
+          $this->use_cache = $core->blog->settings->system->tpl_use_cache;
 
     $this->addBlock('WidgetName',array($this,'Name'));
@@ -61 +61 @@
 
     $this->addValue('WidgetText',array($this,'Text'));
+    $this->addBlock('WidgetTextIf',array($this,'TextIf'));
+    $this->addBlock('WidgetTextLike',array($this,'TextLike'));
+    $this->addValue('WidgetTextMatch',array($this,'TextMatch'));
+    $this->addBlock('WidgetTextNotLike',array($this,'TextNotLike'));
     $this->addBlock('WidgetCheckboxIf',array($this,'CheckboxIf'));
     $this->addBlock('WidgetComboIf',array($this,'ComboIf'));
@@ -81 +85 @@
   // Define a block to be reused
   public function DefineBlock($attr,$content) {
-    return '';
+    return $content;
   }
 
@@ -91 +95 @@
   // Test page type - useful to display a widget on home page only
   public function PageTypeIf($attr,$content) {
-    return '';
+    return $content;
   }
 
   public function Substring($attr,$content) {
-    return '';
+    return $content;
   }
 
@@ -127 +131 @@
   }
   
+  // Widget text field
+  public function TextIf($attr,$content) {
+    return $this->Text($attr).$content;
+  }
+  
+  // Widget text field
+  public function TextLike($attr,$content) {
+    return $this->Text($attr).$content;
+  }
+ 
+  // Widget text field
+  public function TextMatch($attr) {
+    return '';
+  }
+  
+  // Widget text field
+  public function TextNotLike($attr,$content) {
+    return $this->Text($attr).$content;
+  }
+ 
   // Widget checkbox field
   public function CheckboxIf($attr,$content) {