Changeset 1489

Timestamp:

11/14/09 16:59:00 (10 months ago)

Author:

anatoo

Message:

ちょこちょこバグ修正

Location:

applications/nimpad/branches/0.2/lib

URL:

http://svn.nequal.jp/applications/nimpad/branches/0.2/lib

Files:

• NimpadAdmin.php (modified) (2 diffs)
• components/Root.php (modified) (1 diff)
• dao/Wiki.php (modified) (1 diff)
• nim/Mailer.php (modified) (1 diff)
• nim/locator/Deployment.php (modified) (1 diff)

applications/nimpad/branches/0.2/lib/NimpadAdmin.php

@@ -24 +24 @@
     
     /**
+     * @var string
+     */
+    public $baseurl;
+    
+    /**
      * ランダムな名前を持つwikiの作成
      *
      * @param string
+     * @param string $baseurl ex. http://hoge.com/
      * @return string ランダムな名前
      */
-    function createNewWiki($text)
+    function createNewWiki($text, $baseurl)
     {
         $this->pdo->beginTransaction();
@@ -35 +41 @@
             $name = $this->findNewRandomName();
             $wiki_id = $this->daoWiki->create($name, array('home' => 'README'));
-            $this->daoPage->create($wiki_id, 'README', array('html' => $this->textProcessor->render('hatena', $text, 'README'), 'text' => $text));
+            $this->daoPage->create($wiki_id, 'README', 
+                array('html' => $this->textProcessor->render('hatena', $text, 'README', $baseurl . $name . '/'), 
+                      'text' => $text));
             $this->pdo->commit();
         } catch (PDOException $e) {

applications/nimpad/branches/0.2/lib/components/Root.php

@@ -36 +36 @@
         }
         
-        $name = $this->nimpadAdmin->createNewWiki($text);
+        $name = $this->nimpadAdmin->createNewWiki($text, $this->url('/'));
         return new k_SeeOther($this->url($name . '/'));
     }

applications/nimpad/branches/0.2/lib/dao/Wiki.php

@@ -153 +153 @@
     {
         $smt = $this->pdo->prepare('
-            UPDATE nim_Wiki
+            UPDATE nim_wiki
             SET status = ? 
             WHERE id = ? 

applications/nimpad/branches/0.2/lib/nim/Mailer.php

@@ -6 +6 @@
     function __construct($from_author, $from_address)
     {
-        $this->from = 'From: ' . mb_encode_mimeheader(mb_convert_encoding($from_author, 'JIS', 'UTF-8')) . '<' . $from_address . '>';
+        $this->from = 'From: ' . mb_encode_mimeheader(mb_convert_encoding($from_author, 'JIS', 'UTF-8')) . ' <' . $from_address . '>';
     }
     

applications/nimpad/branches/0.2/lib/nim/locator/Deployment.php

@@ -12 +12 @@
         return array(new nim_ExceptionHandler($this->factory, $this->context), 'handleForDeployment');
     }
+    
+    protected function createPdo()
+    {
+        $option = array(/*PDO::ATTR_PERSISTENT => true, */PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8');
+        $pdo = new PDO('mysql:dbname=nimpad;host=127.0.0.1', 'nimpad', $this->dbPassword, $option);
+        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        return $pdo;
+    }
 }