Changeset 1208 for plugins/blocNotes

Timestamp:

06/07/09 01:18:20 (14 years ago)

Author:

Moe

Message:

Bloc-Notes 1.0.3 :

• fixed bug with logins with special characters, personal notes has been moved to (dc_)user (closes #182)

Location:

plugins/blocNotes

Files:

• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• inc/lib.blocNotes.php (modified) (3 diffs)
• post.js (modified) (2 diffs)

plugins/blocNotes/_define.php

@@ -26 +26 @@
 
 $this->registerModule(
-     /* Name */                                        'Bloc-Notes',
-     /* Description*/                        'Display notebooks on the backend',
-     /* Author */                                 'Moe (http://gniark.net/)',
-     /* Version */                                '1.0.2',
-     /* Permissions */                       'usage,contentadmin'
+     /* Name */          'Bloc-Notes',
+     /* Description*/    'Display notebooks on the backend',
+     /* Author */        'Moe (http://gniark.net/)',
+     /* Version */       '1.0.3',
+     /* Permissions */   'usage,contentadmin'
 );
 ?>

plugins/blocNotes/_install.php

@@ -71 +71 @@
 }
 
+# table
+$s = new dbStruct($core->con,$core->prefix);
+ 
+# add blocNotes column to (dc_)user 
+$s->user
+     ->blocNotes('text',0,true,null)
+;
+
+$si = new dbStruct($core->con,$core->prefix);
+$changes = $si->synchronize($s);
+
+# store users setting in (dc_)user
+if (version_compare($i_version,'1.0.3','<'))
+{
+     # users setting (global)
+     $rs = $core->con->select('SELECT setting_value, setting_id '.
+     'FROM '.$core->prefix.'setting '.
+     'WHERE setting_ns = \'blocnotes\' '.
+     'AND (setting_id LIKE \'blocNotes_text_%\');');
+     
+     while($rs->fetch())
+     {
+          $user_id = str_replace('blocNotes_text_','',$rs->setting_id);
+          
+          $cur = $core->con->openCursor($core->prefix.'user');
+          $cur->blocNotes = base64_decode($rs->setting_value);
+          $cur->update('WHERE user_id = \''.$user_id.'\';');
+     }
+     
+     # delete old settings
+     $core->con->execute('DELETE FROM '.$core->prefix.'setting '.
+          'WHERE setting_ns = \'blocnotes\' '.
+          'AND (setting_id LIKE \'blocNotes_text_%\');');
+}
+
 # La procédure d'installation commence vraiment là
 $core->setVersion('blocNotes',$m_version);

plugins/blocNotes/inc/lib.blocNotes.php

@@ -37 +37 @@
                
                $set = $core->blog->settings;
+               
+               $notes = $core->con->select('SELECT blocNotes '.
+                    'FROM '.$core->prefix.'user '.
+                    'WHERE user_id = \''.
+                    $core->con->escape($core->auth->userID()).'\'')->f(0);
 
                echo '<p class="area" id="blocNotes_personal">'.
@@ -43 +48 @@
                     '</label>'.
                     form::textarea('blocNotes_personal_text',80,5,
-                    html::escapeHTML(base64_decode(
-                         $set->{'blocNotes_text_'.$core->auth->userID()}),
-                    'maximal')).
+                    html::escapeHTML($notes),'maximal').
                     '</p>'.
                     '<p class="area" id="blocNotes">'.
@@ -66 +69 @@
                if (isset($_POST['blocNotes_text']))
                {
+                    # Personal notebook
+                    $cur = $core->con->openCursor($core->prefix.'user');
+                    $cur->blocNotes = $_POST['blocNotes_personal_text'];
+                    $cur->update('WHERE user_id = \''.$core->con->escape($core->auth->userID()).'\'');
+                    
                     $core->blog->settings->setNameSpace('blocnotes');
-                    # Bloc-Notes' text
-                    $core->blog->settings->put(
-                         'blocNotes_text_'.$core->auth->userID(),
-                         base64_encode($_POST['blocNotes_personal_text']),'text',
-                         'Bloc-Notes\' personal text',true,true);
+                    # Blog-specific notebook
                     $core->blog->settings->put('blocNotes_text',
                          base64_encode($_POST['blocNotes_text']),'text',

plugins/blocNotes/post.js

@@ -2 +2 @@
 
  This file is part of Bloc-Notes.
- Copyright 2008 Moe (http://gniark.net/)
+ Copyright 2008,2009 Moe (http://gniark.net/)
 
  Bloc-Notes is free software; you can redistribute it and/or modify
@@ -17 +17 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
- Icon (icon.png) is from Silk Icons : http://www.famfamfam.com/lab/icons/silk/
+ Icon (icon.png) is from Silk Icons :
+ http://www.famfamfam.com/lab/icons/silk/
 
  ***** END LICENSE BLOCK *****/