Changeset 911

Timestamp:

03/20/09 00:19:46 (14 years ago)

Author:

Oaz

Message:

Added 'Bonjour' widget and associated code
Moved to AGPLv3 license

Location:

plugins/templateWidget/trunk

Files:

• COPYING (added)
• WidgetBuilder.php (modified) (3 diffs)
• _admin.php (modified) (2 diffs)
• _define.php (modified) (3 diffs)
• _public.php (modified) (4 diffs)
• default-templates/bonjour.widget.html (added)
• default-templates/categories.and.entries.widget.html (modified) (1 diff)

plugins/templateWidget/trunk/WidgetBuilder.php

@@ -1 +1 @@
 <?php
 # ***** BEGIN LICENSE BLOCK *****
+# This file is part of templateWidget
 # Copyright (c) 2009 Olivier Azeau and contributors. All rights reserved.
 #
 # This is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# it under the terms of the Affero GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
@@ -13 +14 @@
 # GNU General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with DotClear; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the Affero GNU General Public License
+# along with templateWidget; If not, see <http://www.gnu.org/licenses/>.
 #
+# templateWidget is a plugin for Dotclear software.
+# templateWidget is not part of Dotclear.
+# templateWidget can be used inside Dotclear but this license only applies to templateWidget
 # ***** END LICENSE BLOCK *****
 
@@ -35 +38 @@
           files::makeDir(DC_WIDGET_ADMIN_TPL_CACHE,true);
           parent::__construct(DC_WIDGET_ADMIN_TPL_CACHE,$self_name);
+
+          $this->tag_block = '<tpl:(%1$s)(?:(\s+.*?)>|>)(.*?)</tpl:%1$s>';
+          $this->tag_value = '{{tpl:(%s)(\s(.*?))?}}';
 
     $this->setPath(

plugins/templateWidget/trunk/_admin.php

@@ -1 +1 @@
 <?php
 # ***** BEGIN LICENSE BLOCK *****
-# Copyright (c) 2008-2009 Olivier Azeau and contributors. All rights reserved.
+# This file is part of templateWidget
+# Copyright (c) 2009 Olivier Azeau and contributors. All rights reserved.
 #
 # This is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# it under the terms of the Affero GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
@@ -13 +14 @@
 # GNU General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with DotClear; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the Affero GNU General Public License
+# along with templateWidget; If not, see <http://www.gnu.org/licenses/>.
 #
+# templateWidget is a plugin for Dotclear software.
+# templateWidget is not part of Dotclear.
+# templateWidget can be used inside Dotclear but this license only applies to templateWidget
 # ***** END LICENSE BLOCK *****
+
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 

plugins/templateWidget/trunk/_define.php

@@ -1 +1 @@
 <?php
 # ***** BEGIN LICENSE BLOCK *****
-# Copyright (c) 2008-2009 Olivier Azeau and contributors. All rights reserved.
+# This file is part of templateWidget
+# Copyright (c) 2009 Olivier Azeau and contributors. All rights reserved.
 #
 # This is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# it under the terms of the Affero GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
@@ -13 +14 @@
 # GNU General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with DotClear; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the Affero GNU General Public License
+# along with templateWidget; If not, see <http://www.gnu.org/licenses/>.
 #
+# templateWidget is a plugin for Dotclear software.
+# templateWidget is not part of Dotclear.
+# templateWidget can be used inside Dotclear but this license only applies to templateWidget
 # ***** END LICENSE BLOCK *****
+
 if (!defined('DC_RC_PATH')) { return; }
 
@@ -24 +28 @@
      /* Description*/         "Define widgets using template file only",
      /* Author */             "Olivier Azeau",
-     /* Version */            '1.1',
+     /* Version */            '1.2',
      /* Permissions */        null
 );

plugins/templateWidget/trunk/_public.php

@@ -1 +1 @@
 <?php
 # ***** BEGIN LICENSE BLOCK *****
-# Copyright (c) 2008-2009 Olivier Azeau and contributors. All rights reserved.
+# This file is part of templateWidget
+# Copyright (c) 2009 Olivier Azeau and contributors. All rights reserved.
 #
 # This is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# it under the terms of the Affero GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
@@ -13 +14 @@
 # GNU General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with DotClear; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the Affero GNU General Public License
+# along with templateWidget; If not, see <http://www.gnu.org/licenses/>.
 #
+# templateWidget is a plugin for Dotclear software.
+# templateWidget is not part of Dotclear.
+# templateWidget can be used inside Dotclear but this license only applies to templateWidget
 # ***** END LICENSE BLOCK *****
+
 if (!defined('DC_RC_PATH')) { return; }
 
@@ -32 +36 @@
 $core->tpl->addBlock('WidgetComboIf',array('templateWidgetBlocksAndValues','ComboIf'));
 $core->tpl->addValue('WidgetCombo',array('templateWidgetBlocksAndValues','Combo'));
+
+
+$core->tpl->addBlock('IfKnownVisitor',array('templateWidgetBlocksAndValues','IfKnownVisitor'));
+
+$core->addBehavior('tplBeforeData',array('templateWidgetBehaviors','loadVisitorCookie'));
 
 define('CRLF',"\r\n");
@@ -120 +129 @@
           '<?php endif; ?>'.CRLF;
   }
+  
+  //=========================================================
+
+  public static function IfKnownVisitor($attr,$content) {
+          return
+          '<?php if ($_ctx->comment_preview !== null && $_ctx->comment_preview["name"]) : ?>'.
+          $content.
+          '<?php endif; ?>';
+  }
 }
+
+
+class templateWidgetBehaviors
+{
+  public static function loadVisitorCookie(&$core)
+  {
+    if(@$_ctx->comment_preview['name'])
+      return;
+    if (empty($_COOKIE['comment_info']))
+      return;
+    $visitorInfos = split("\n",$_COOKIE['comment_info']);
+    global $_ctx;
+          $_ctx->comment_preview = new ArrayObject();
+    $_ctx->comment_preview['name'] = @$_ctx->comment_preview['name'] ? $_ctx->comment_preview['name'] : $visitorInfos[0];
+          $_ctx->comment_preview['mail'] = @$_ctx->comment_preview['mail'] ? $_ctx->comment_preview['mail'] : $visitorInfos[1];
+          $_ctx->comment_preview['site'] = @$_ctx->comment_preview['site'] ? $_ctx->comment_preview['site'] : $visitorInfos[2];
+          $_ctx->comment_preview['content'] = '';
+          $_ctx->comment_preview['rawcontent'] = '';
+          $_ctx->comment_preview['remember'] = false;
+          $_ctx->comment_preview['preview'] = false;
+  }
+}
+
+
 ?>

plugins/templateWidget/trunk/default-templates/categories.and.entries.widget.html

@@ -34 +34 @@
   </tpl:WidgetPageTypeIf>
 </tpl:WidgetCheckboxIf>
+
 <tpl:WidgetCheckboxIf name="homeonly" value="0">
   {{tpl:WidgetUseBlock name="Main"}}