Changeset 3146

Timestamp:

07/31/13 20:41:02 (10 years ago)

Author:

brol

Message:

vversion 1.4, reprise de ce quickfix :  http://forum.dotclear.org/viewtopic.php?pid=297310#p297310

Location:

plugins/authorMode

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _prepend.php (modified) (5 diffs)
• _public.php (modified) (4 diffs)
• _widgets.php (modified) (2 diffs)
• default-templates/author.html (modified) (1 diff)
• default-templates/authors.html (modified) (1 diff)
• index.php (modified) (2 diffs)

plugins/authorMode/_admin.php

@@ -27 +27 @@
 class authorModeBehaviors
 {
-     public static function adminBeforeUserUpdate(&$cur,&$user_id = '')
+     public static function adminBeforeUserUpdate($cur,$user_id = '')
      {
           $cur->user_desc = $_POST['user_desc'];
@@ -39 +39 @@
      }
      
-     public static function adminAuthorForm(&$rs)
+     public static function adminAuthorForm($rs)
      {
           if ($rs instanceof dcCore) {

plugins/authorMode/_define.php

@@ -16 +16 @@
      /* Description*/         "post entries per author + author desc handling",
      /* Author */             "xave",
-     /* Version */            '1.3',
+     /* Version */            '1.4',
      /* Permissions */        'admin,contentadmin'
 );

plugins/authorMode/_install.php

@@ -18 +18 @@
 }
 
-$core->blog->settings->setNameSpace('authormode');
+$core->blog->settings->addNameSpace('authormode');
 if ($cur_version === null)
 {
-     $core->blog->settings->put('authormode_active',false,'boolean');
-     $core->blog->settings->put('authormode_url_author','author','string');
-     $core->blog->settings->put('authormode_url_authors','authors','string');
-     $core->blog->settings->put('authormode_default_alpha_order',true,'boolean');
-     $core->blog->settings->put('authormode_default_posts_only',true,'boolean');
+     $core->blog->settings->authormode->put('authormode_active',false,'boolean');
+     $core->blog->settings->authormode->put('authormode_url_author','author','string');
+     $core->blog->settings->authormode->put('authormode_url_authors','authors','string');
+     $core->blog->settings->authormode->put('authormode_default_alpha_order',true,'boolean');
+     $core->blog->settings->authormode->put('authormode_default_posts_only',true,'boolean');
 }
 elseif (version_compare($cur_version,'1.1','<='))
 {
-     $core->blog->settings->put('authormode_default_alpha_order',true,'boolean');
-     $core->blog->settings->put('authormode_default_posts_only',true,'boolean');
+     $core->blog->settings->authormode->put('authormode_default_alpha_order',true,'boolean');
+     $core->blog->settings->authormode->put('authormode_default_posts_only',true,'boolean');
 }
 $core->setVersion('authorMode',$new_version);

plugins/authorMode/_prepend.php

@@ -16 +16 @@
 class rsAuthor
 {
-     public static function getAuthorCN(&$rs)
+     public static function getAuthorCN($rs)
      {
           return dcUtils::getUserCN($rs->user_id, $rs->user_name,
@@ -22 +22 @@
      }
      
-     public static function getAuthorLink(&$rs)
+     public static function getAuthorLink($rs)
      {
           $res = '%1$s';
@@ -33 +33 @@
      }
      
-     public static function getAuthorEmail(&$rs,$encoded=true)
+     public static function getAuthorEmail($rs,$encoded=true)
      {
           if ($encoded) {
@@ -42 +42 @@
 }
 
-if ($core->blog->settings->authormode_active)
+if ($core->blog->settings->authormode->authormode_active)
 {
-     if ($core->blog->settings->authormode_url_author !== null) {
-          $url_prefix = $core->blog->settings->authormode_url_author;
+     if ($core->blog->settings->authormode->authormode_url_author !== null) {
+          $url_prefix = $core->blog->settings->authormode->authormode_url_author;
           if (empty($url_prefix)) {
                $url_prefix = 'author';
@@ -55 +55 @@
      }
      
-     if ($core->blog->settings->authormode_url_authors !== null) {
-          $url_prefix = $core->blog->settings->authormode_url_authors;
+     if ($core->blog->settings->authormode->authormode_url_authors !== null) {
+          $url_prefix = $core->blog->settings->authormode->authormode_url_authors;
           if (empty($url_prefix)) {
                $url_prefix = 'authors';

plugins/authorMode/_public.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 if (!defined('DC_RC_PATH')) { return; }
-if (!$core->blog->settings->authormode_active) { return; }
+if (!$core->blog->settings->authormode->authormode_active) { return; }
 
 require_once dirname(__FILE__).'/_widgets.php';
@@ -52 +52 @@
      }
      
-     public static function addTplPath(&$core)
+     public static function addTplPath($core)
      {
           $core->tpl->setPath($core->tpl->getPath(),dirname(__FILE__).'/default-templates');
@@ -302 +302 @@
                " AND P.post_type = '".$core->con->escape($params['post_type'])."' ";
           }
-          elseif ($core->blog->settings->authormode_default_posts_only)
+          elseif ($core->blog->settings->authormode->authormode_default_posts_only)
           {
                $strReq .=
@@ -315 +315 @@
                'ORDER BY '.$core->con->escape($params['order']).' ';
           }
-          elseif ($core->blog->settings->authormode_default_alpha_order)
+          elseif ($core->blog->settings->authormode->authormode_default_alpha_order)
           {
                $strReq .=

plugins/authorMode/_widgets.php

@@ -16 +16 @@
 class widgetsAuthorMode
 {
-     public static function authors(&$w)
+     public static function authors($w)
      {
           global $core;
           
-          if (!$core->blog->settings->authormode_active) return;
+          if (!$core->blog->settings->authormode->authormode_active) return;
           
           $rs = authormodeUtils::getPostsUsers();
@@ -60 +60 @@
      }
      
-     public static function init(&$w)
+     public static function init($w)
      {
          $w->create('authors',__('Authors'),array('widgetsAuthorMode','authors'));

plugins/authorMode/default-templates/author.html

@@ -4 +4 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="MSSmartTagsPreventParsing" content="TRUE" />
+
   <meta name="ROBOTS" content="{{tpl:BlogMetaRobots robots="NOINDEX"}}" />
 

plugins/authorMode/default-templates/authors.html

@@ -4 +4 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="MSSmartTagsPreventParsing" content="TRUE" />
+
   <meta name="ROBOTS" content="{{tpl:BlogMetaRobots}}" />
 

plugins/authorMode/index.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { exit; }
 
-$active      = $core->blog->settings->authormode_active;
-$url_author  = $core->blog->settings->authormode_url_author;
-$url_authors = $core->blog->settings->authormode_url_authors;
-$posts_only  = $core->blog->settings->authormode_default_posts_only;
-$alpha_order = $core->blog->settings->authormode_default_alpha_order;
+$active      = $core->blog->settings->authormode->authormode_active;
+$url_author  = $core->blog->settings->authormode->authormode_url_author;
+$url_authors = $core->blog->settings->authormode->authormode_url_authors;
+$posts_only  = $core->blog->settings->authormode->authormode_default_posts_only;
+$alpha_order = $core->blog->settings->authormode->authormode_default_alpha_order;
 
 if (!empty($_POST['saveconfig'])) {
      try
      {
-          $core->blog->settings->setNameSpace('authormode');
+          $core->blog->settings->addNameSpace('authormode');
           
           $active = (empty($_POST['active']))?false:true;
@@ -37 +37 @@
           $alpha_order = (empty($_POST['alpha_order']))?false:true;
           
-          $core->blog->settings->put('authormode_active',$active,'boolean');
-          $core->blog->settings->put('authormode_url_author',$url_author,'string');
-          $core->blog->settings->put('authormode_url_authors',$url_authors,'string');
-          $core->blog->settings->put('authormode_default_posts_only',$posts_only,'boolean');
-          $core->blog->settings->put('authormode_default_alpha_order',$alpha_order,'boolean');
+          $core->blog->settings->authormode->put('authormode_active',$active,'boolean');
+          $core->blog->settings->authormode->put('authormode_url_author',$url_author,'string');
+          $core->blog->settings->authormode->put('authormode_url_authors',$url_authors,'string');
+          $core->blog->settings->authormode->put('authormode_default_posts_only',$posts_only,'boolean');
+          $core->blog->settings->authormode->put('authormode_default_alpha_order',$alpha_order,'boolean');
           $core->blog->triggerBlog();