Changeset 2881

Timestamp:

01/15/11 18:52:02 (12 years ago)

Author:

kemar

Message:

• Mise en conformité des settings pour 2.2
• Création des settings via mécanisme d'install
• Ur lde base du blog crée en fonction du type d'url

(closes #632, #634)

Location:

plugins/subscription

Files:

• _define.php (modified) (1 diff)
• inc/class.subscription.php (modified) (2 diffs)
• index.php (modified) (4 diffs)

plugins/subscription/_define.php

@@ -16 +16 @@
      /* Description*/         "Public blog and user creation form for multiblogs",
      /* Author */             "kemar",
-     /* Version */            '2.0 alpha',
+     /* Version */            '1.1',
      /* Permissions */        null
 );

plugins/subscription/inc/class.subscription.php

@@ -73 +73 @@
           
           //settings
-          $core->blog->settings->setNamespace('subscription');
-          $blogs_folder_path       = $core->blog->settings->blogs_folder_path;  
-          $dotclear_folder_path    = $core->blog->settings->dotclear_folder_path;    
+          $settings = new dcSettings($core, null);
+          $blogs_folder_path       = $settings->subscription->blogs_folder_path;     
+          $dotclear_folder_path    = $settings->subscription->dotclear_folder_path;  
           
           //blog
@@ -83 +83 @@
      
           $cur->blog_id  = $subscription['blog_url'];
-          $cur->blog_url = $root_url.'index.php?';
+          
+          $cur->blog_url = $root_url.'index.php';
+          //$cur->blog_url.= ($core->url->mode == 'query_string') ? '?' : '/';
+          
           $cur->blog_name = $subscription['blog_name'];
           

plugins/subscription/index.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 
-
-$core->blog->settings->setNamespace('subscription');
 
 //Liste des SuperUsers (pour affichage des mails)
@@ -27 +25 @@
 
 
+
 if(isset($_POST['notify_mail_adress'])) {
      try {
@@ -37 +36 @@
           }
           
-          $core->blog->settings->setNamespace('subscription');
-          
-          $core->blog->settings->put('blogs_folder_path', $blogs_folder_path, 'string', 'Blogs storage folder path', true, true);
-          $core->blog->settings->put('dotclear_folder_path', $dotclear_folder_path, 'string', 'Dotclear folder path', true, true);
-          $core->blog->settings->put('notify_mail_adress', $notify_mail_adress  , 'string', 'Email address for notification', true, true);
-          
-          $core->blog->triggerBlog();
+          $settings = new dcSettings($core, null);
+          $settings->subscription->put('blogs_folder_path', $blogs_folder_path, 'string', 'Blogs storage folder path', true, true);
+          $settings->subscription->put('dotclear_folder_path', $dotclear_folder_path, 'string', 'Dotclear folder path', true, true);
+                    
+          $core->blog->triggerBlog(); //still needed ?
      
           http::redirect($p_url.'&upd=1');
@@ -69 +66 @@
 }
 
+$settings = new dcSettings($core, null);
+
 echo
 '<form action="'.$p_url.'" method="post" enctype="multipart/form-data">'.
 '<fieldset><legend>'.__('Paths').'</legend>'.
 '<p>'.__('Set absolute paths for Doctclear installation and blogs storage folder.').'</p>'.
-'<p><label>'.__('Dotclear path:').' '.form::field('dotclear_folder_path',40,300,$core->blog->settings->dotclear_folder_path).'</label></p>'.
-'<p><label>'.__('Blogs path:').' '.form::field('blogs_folder_path',40,300,$core->blog->settings->blogs_folder_path).'</label></p>'.
-'</fieldset>'.
-'<fieldset><legend>'.__('Email adress for notification').'</legend>'.
-'<p><label>'.__('Adress to notify blog creation to administrator').
-form::combo('notify_mail_adress',$ulist, $core->blog->settings->notify_mail_adress).
-'</label></p>'.
-
+'<p><label>'.__('Dotclear path:').' '.form::field('dotclear_folder_path',40,300,$settings->subscription->dotclear_folder_path).'</label></p>'.
+'<p><label>'.__('Blogs path:').' '.form::field('blogs_folder_path',40,300,$settings->subscription->blogs_folder_path).'</label></p>'.
 '</fieldset>';
-
-/*
-echo 
-'<fieldset><legend>'.__('Presentation options').'</legend>'.
-'<p><label class="required" title="'.__('Required field').'">'.__('Page title:').' '.
-form::field('cm_page_title',30,256,html::escapeHTML($page_title)).
-'</label></p>'.
-'<p class="area"><label>'.__('Form caption:').' '.
-form::textarea('cm_form_caption',30,2,html::escapeHTML($form_caption)).
-'</label></p>'.
-'<p class="area"><label class="required" title="'.__('Required field').'">'.__('Confirmation message:').' '.
-form::textarea('cm_msg_success',30,2,html::escapeHTML($msg_success)).
-'</label></p>'.
-'<p class="area"><label class="required" title="'.__('Required field').'">'.__('Error message:').' '.
-form::textarea('cm_msg_error',30,2,html::escapeHTML($msg_error)).
-'</label></p>'.
-'<p class="form-note">'.__('"%s" is the error message.').'</p>'.
-'</fieldset>';
-*/
 
 echo