Changeset 2108

Timestamp:

03/08/10 22:10:58 (14 years ago)

Author:

Oaz

Message:

fixed multipart email bug + added DB content display

Location:

plugins/myForms/trunk

Files:

• Email.php (modified) (3 diffs)
• TplCore.php (modified) (2 diffs)
• TplDatabase.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _public.php (modified) (6 diffs)
• demo/email.myforms.html (modified) (1 diff)
• index.php (modified) (2 diffs)

plugins/myForms/trunk/Email.php

@@ -34 +34 @@
     $this->bodyformat =
       '--'.$this->altboundary."\n".
-      'Content-Type: text/%s; charset="iso-8859-1"'."\n".
+      'Content-Type: text/%s; charset="utf-8"'."\n".
       'Content-Transfer-Encoding: 7bit'."\n\n%s\n";
       
@@ -78 +78 @@
       sprintf($this->bodyformat, 'plain', self::html2text(nl2br($text))).
       sprintf($this->bodyformat, 'html', $text).
-      '--'.$this->altboundary."\n";
+      '--'.$this->altboundary;
   }
   
@@ -105 +105 @@
         '--'.$this->mixedboundary."\n".
         $alt."\n\n".
-        $this->body."\n".
+        $this->body."\n\n".
         $this->attachments.
-        '--'.$this->mixedboundary."\n";
+        '--'.$this->mixedboundary."--\n";
     } else {
       array_unshift($this->headers, $alt);
-      $message = $this->body;
+      $message = $this->body."--\n";
     }
     try

plugins/myForms/trunk/TplCore.php

@@ -20 +20 @@
 
 $core->tpl->addValue('myformsContext',array('MyFormsTplCore','Context'));
+$core->tpl->addBlock('myformsPassword',array('MyFormsTplCore','Password'));
 $core->tpl->addBlock('myformsInfo',array('MyFormsTplCore','Info'));
 $core->tpl->addValue('myformsInfo',array('MyFormsTplCore','DisplayInfo'));
@@ -57 +58 @@
     $checks .= ' ?>';
     return $checks;
+  }
+
+  // Define the form password
+  public static function Password($attr,$content)
+  {
+    return '<?php MyForms::password("'.$content.'"); ?>';
   }
 

plugins/myForms/trunk/TplDatabase.php

@@ -25 +25 @@
 $core->tpl->addBlock('myformsRecordField',array('MyFormsTplDatabase','RecordField'));
 
+$core->tpl->addBlock('myformsDbSelect',array('MyFormsTplDatabase','DbSelect'));
+$core->tpl->addBlock('myformsDbRecord',array('MyFormsTplDatabase','DbRecord'));
+$core->tpl->addValue('myformsDbField',array('MyFormsTplDatabase','DbField'));
+
 class MyFormsTplDatabase
 {
@@ -42 +46 @@
   }
   
+  public static function DbSelect($attr,$content)
+  {
+    $where = "";
+    if(isset($attr['where']))
+      $where = ' WHERE '.$attr['where'];
+    return '<?php $record = $core->con->select("SELECT * FROM ".$core->prefix."'.$attr['table'].$where.'"); ?>'.$content;
+     }
+  
+  public static function DbRecord($attr,$content)
+  {
+    return '<?php while ($record->fetch()) { ?>'.
+           $content.
+           '<?php } ?>';
+     }
+
+  public static function DbField($attr)
+  {
+    return '<?php print $record->field("'.$attr['name'].'"); ?>';
+  }
+  
 }
 ?>

plugins/myForms/trunk/_define.php

@@ -23 +23 @@
      /* Description*/         "Create a custom form page with custom action (save in db, send email…)",
      /* Author */             "Olivier Azeau",
-     /* Version */            '0.3a',
+     /* Version */            '0.4',
      /* Permissions */        null
 );

plugins/myForms/trunk/_public.php

@@ -29 +29 @@
 $core->url->register('formPost','form','^form$',array('MyForms','formPost'));
 
+class PostSimu
+{
+  public function getURL()
+  {
+    return $_SERVER['REQUEST_URI'];
+  }
+}
+
 class MyForms extends dcUrlHandlers
 {
@@ -39 +47 @@
   private static $allFieldsAreValidated;
   private static $captchaIsValidated;
+  private static $passwordProtected;
   
   public static function formGet($args)
@@ -55 +64 @@
   public static function form()
   {
-    global $core, $_REQUEST;
+    global $core, $_REQUEST, $_ctx;
     
     // add all 'default-templates' folders to form search path
@@ -63 +72 @@
                array_push($tplPath, $plugin['root'].'/default-templates');
     $core->tpl->setPath($tplPath);
+
+    self::$passwordProtected = false;
     
     self::loadForm();
+    
+    if(self::$passwordProtected) {
+      $_ctx->posts = new PostSimu();
+               self::serveDocument('password-form.html','text/html',false);
+               return;
+          }
     
     // process  form post
@@ -99 +116 @@
     $core->tpl->getData($formTpl);
     
+    // form is password protected
+    if(self::$passwordProtected) {
+            // Get passwords cookie
+               if (isset($_COOKIE['dc_form_passwd'])) {
+                    $pwd_cookie = unserialize($_COOKIE['dc_form_passwd']);
+               } else {
+                    $pwd_cookie = array();
+               }
+                         
+               // Check for match
+               if ((!empty($_POST['password']) && $_POST['password'] == self::$passwordProtected)
+               || (isset($pwd_cookie[self::$formID]) && $pwd_cookie[self::$formID] == self::$passwordProtected))   {
+                 // store password in cookie and clear password protection
+                    $pwd_cookie[self::$formID] = self::$passwordProtected;
+                    setcookie('dc_form_passwd',serialize($pwd_cookie),0,'/');
+        self::$passwordProtected = false;
+               } else {
+                 // incorrect password : no need to go further
+                 return;
+               }
+    }
+    
     // field display and validation
     self::$allFieldsAreValidated = true;
@@ -143 +182 @@
   {
     print self::$htmlOut;
+  }
+  
+  public static function password($pw)
+  {
+    self::$passwordProtected = $pw;
   }
   

plugins/myForms/trunk/demo/email.myforms.html

@@ -1 +1 @@
 <tpl:myformsInfo name="title">{{tpl:BlogName encode_html="1"}} - Send email</tpl:myformsInfo>
+<tpl:myformsPassword>secret</tpl:myformsPassword>
 
 <tpl:myformsOnInit>

plugins/myForms/trunk/index.php

@@ -25 +25 @@
 $core->themes = new dcThemes($core);
 $core->themes->loadModules($core->blog->themes_path,null);
-$themeEditorClass = path::real(dirname(__FILE__).'/../themeEditor/class.themeEditor.php');
-if($themeEditorClass) {
-  require_once($themeEditorClass);
+$themeEditorRootPath = $core->plugins->moduleRoot("themeEditor");
+if($themeEditorRootPath) {
+  require_once($themeEditorRootPath."/class.themeEditor.php");
   class myFormsTplFileFinder extends dcThemeEditor
   {
@@ -77 +77 @@
   }
 
-  if($themeEditorClass) {
+  if($themeEditorRootPath) {
     print '<h2>'.__('Click on a form to modify it.').'</h2>';
     $fileFinder = new myFormsTplFileFinder($core);