Changeset 2317

Timestamp:

06/07/10 03:55:49 (13 years ago)

Author:

JcDenis

Message:

dcQRcode 0.7

• Switched to DC 2.2
• Fixed use of MEBKM on widget

Location:

plugins/dcQRcode

Files:

• _define.php (modified) (1 diff)
• _install.php (modified) (4 diffs)
• _prepend.php (modified) (2 diffs)
• _public.php (modified) (10 diffs)
• inc/class.dc.qr.code.php (modified) (1 diff)
• index.php (modified) (5 diffs)
• release.txt (modified) (1 diff)

plugins/dcQRcode/_define.php

@@ -17 +17 @@
      /* Description*/         "Use QR code on your blog",
      /* Author */             "JC Denis",
-     /* Version */            '0.6.1',
+     /* Version */            '0.7',
      /* Permissions */        'admin'
 );
-     /* date */          #20100119
+     /* date */          #2010606
 ?>

plugins/dcQRcode/_install.php

@@ -18 +18 @@
 if (version_compare($old_version,$new_version,'>=')) return;
 
-try {
-     # Is DC 2.1.5 ?
-     if (!version_compare(DC_VERSION,'2.1.5','>=')) {
-
-          throw new Exception('dcQRcode requires Dotclear 2.1.5');
+try
+{
+     # Check DC version
+     if (version_compare(DC_VERSION,'2.2-beta','<'))
+     {
+          throw new Exception('dcQRcode requires Dotclear 2.2');
      }
+     
      # Database
      $s = new dbStruct($core->con,$core->prefix);
@@ -35 +37 @@
           ->index('idx_qrcode_blog_id','btree','blog_id')
           ->index('idx_qrcode_type','btree','qrcode_type');
-
+     
      $si = new dbStruct($core->con,$core->prefix);
      $changes = $si->synchronize($s);
      $s = null;
-
+     
      # Settings
-     $s =& $core->blog->settings;
-     $s->setNameSpace('dcQRcode');
+     $core->blog->settings->addNamespace('dcQRcode');
+     $s = $core->blog->settings->dcQRcode;
      $s->put('qrc_active',false,'boolean','Enable plugin',false,true);
      $s->put('qrc_use_mebkm',true,'boolean','Use MEBKM anchor',false,true);
@@ -53 +55 @@
      $s->put('qrc_api_ec_margin',1,'integer','',false,true);
      $s->put('qrc_api_out_enc','UTF-8','string','',false,true);
-     $s->setNameSpace('system');
 
      # Version
@@ -60 +61 @@
      return true;
 }
-catch (Exception $e) {
+catch (Exception $e)
+{
      $core->error->add($e->getMessage());
 }

plugins/dcQRcode/_prepend.php

@@ -14 +14 @@
 
 global $__autoload, $core;
+$core->blog->settings->addNamespace('dcQRcode');
 
 $__autoload['dcQRcode'] = dirname(__FILE__).'/inc/class.dc.qr.code.php';
@@ -27 +28 @@
 
 $find = false;
-$custom = $core->blog->settings->qrc_public_path;
+$custom = $core->blog->settings->dcQRcode->qrc_public_path;
 $default = $core->blog->public_path;
 
 # See if don't want cache
-if (!$core->blog->settings->qrc_cache_use) {
+if (!$core->blog->settings->dcQRcode->qrc_cache_use)
+{
      $qrc_cache_path = null;
 }

plugins/dcQRcode/_public.php

@@ -29 +29 @@
           global $core;
 
-          if (!$core->blog->settings->qrc_active) {
+          if (!$core->blog->settings->dcQRcode->qrc_active) {
                self::p404();
                return;
@@ -69 +69 @@
 
           $_ctx->qrcode = new dcQRcode($core,QRC_CACHE_PATH);
-          $_ctx->qrcode->setSize($core->blog->settings->qrc_img_size);
-          $_ctx->qrcode->setParams('use_mebkm',$core->blog->settings->qrc_use_mebkm);
+          $_ctx->qrcode->setSize($core->blog->settings->dcQRcode->qrc_img_size);
+          $_ctx->qrcode->setParams('use_mebkm',$core->blog->settings->dcQRcode->qrc_use_mebkm);
      }
 
@@ -85 +85 @@
      public static function publicEntryBehaviorContent($core,$_ctx,$place)
      {
-          if (!$core->blog->settings->qrc_active 
-          || $core->blog->settings->qrc_bhv_entryplace != $place 
+          if (!$core->blog->settings->dcQRcode->qrc_active 
+          || $core->blog->settings->dcQRcode->qrc_bhv_entryplace != $place 
           || !$_ctx->exists('posts') 
           || !in_array($_ctx->current_tpl,array('home.html','post.html','category.html','tag.html','archive_month.html')) 
-          || !$core->blog->settings->qrc_bhv_entrytplhome && $_ctx->current_tpl == 'home.html' 
-          || !$core->blog->settings->qrc_bhv_entrytplpost && $_ctx->current_tpl == 'post.html' 
-          || !$core->blog->settings->qrc_bhv_entrytplcategory && $_ctx->current_tpl == 'category.html' 
-          || !$core->blog->settings->qrc_bhv_entrytpltag && $_ctx->current_tpl == 'tag.html' 
-          || !$core->blog->settings->qrc_bhv_entrytplarchive && $_ctx->current_tpl == 'archive_month.html' 
+          || !$core->blog->settings->dcQRcode->qrc_bhv_entrytplhome && $_ctx->current_tpl == 'home.html' 
+          || !$core->blog->settings->dcQRcode->qrc_bhv_entrytplpost && $_ctx->current_tpl == 'post.html' 
+          || !$core->blog->settings->dcQRcode->qrc_bhv_entrytplcategory && $_ctx->current_tpl == 'category.html' 
+          || !$core->blog->settings->dcQRcode->qrc_bhv_entrytpltag && $_ctx->current_tpl == 'tag.html' 
+          || !$core->blog->settings->dcQRcode->qrc_bhv_entrytplarchive && $_ctx->current_tpl == 'archive_month.html' 
           ) return;
 
@@ -114 +114 @@
           global $core, $_ctx;
 
-          if (!$core->blog->settings->qrc_active) return;
+          if (!$core->blog->settings->dcQRcode->qrc_active) return;
 
           $size = isset($attr['size']) ? (integer) $attr['size'] : 128;
@@ -134 +134 @@
                "<?php if (\$_ctx->exists('posts')".
                " && \$_ctx->posts->post_type == 'post'".
-               " && \$core->blog->settings->qrc_active) { \n".
+               " && \$core->blog->settings->dcQRcode->qrc_active) { \n".
                "\$_ctx->qrcode->setType('URL'); ".
                "\$title = \$core->blog->name.' - '.\$_ctx->posts->post_title; \n".
@@ -147 +147 @@
                $res .= 
                "<?php if (\$_ctx->exists('categories')".
-               " && \$core->blog->settings->qrc_active) { \n".
+               " && \$core->blog->settings->dcQRcode->qrc_active) { \n".
                "\$_ctx->qrcode->setType('URL'); ".
                "\$title = \$core->blog->name.' - '.\$_ctx->categories->cat_title; \n".
@@ -160 +160 @@
                $res .= 
                "<?php if (\$_ctx->exists('meta')".
-               " && \$core->blog->settings->qrc_active) { \n".
+               " && \$core->blog->settings->dcQRcode->qrc_active) { \n".
                "\$_ctx->qrcode->setType('URL'); ".
-               "\$title = \$core->blog->name.' - '.\$_ctx->meta->meat_id; \n".
+               "\$title = \$core->blog->name.' - '.\$_ctx->meta->meta_id; \n".
                "\$url = \$core->blog->url.\$core->url->getBase('tag').'/'.\$_ctx->meta->meta_id; \n".
                "\$id = \$_ctx->qrcode->encode(\$url,\$title); \n".
@@ -259 +259 @@
           "</p>'; \n".
           // regain standard settings
-          "\$_ctx->qrcode->setSize(\$core->blog->settings->qrc_img_size); \n".
-          "\$_ctx->qrcode->setParams('use_mebkm',\$core->blog->settings->qrc_use_mebkm); \n".
+          "\$_ctx->qrcode->setSize(\$core->blog->settings->dcQRcode->qrc_img_size); \n".
+          "\$_ctx->qrcode->setParams('use_mebkm',\$core->blog->settings->dcQRcode->qrc_use_mebkm); \n".
           "unset(\$id); } ?> \n";
 
@@ -288 +288 @@
 
           # plugin active
-          if (!$core->blog->settings->qrc_active) return;
+          if (!$core->blog->settings->dcQRcode->qrc_active) return;
 
           # qrc class
@@ -294 +294 @@
           $qrc->setSize($w->size);
           $qrc->setType('URL');
-          $qrc->setParams('use_mebkm',$w->mebkm);
+          $qrc->setParams('use_mebkm',$core->blog->settings->dcQRcode->qrc_use_mebkm);
 
           $url = $core->blog->url;

plugins/dcQRcode/inc/class.dc.qr.code.php

@@ -41 +41 @@
           $this->cache_path = $cache_path;
 
-          if ($core->blog->settings->qrc_api_url)
-               $this->qrc_api_url = $core->blog->settings->qrc_api_url;
-
-          if ($core->blog->settings->qrc_api_ec_level)
-               $this->qrc_api_ec_level = $core->blog->settings->qrc_api_ec_level;
-
-          if ($core->blog->settings->qrc_api_ec_margin)
-               $this->qrc_api_ec_margin = $core->blog->settings->qrc_api_ec_margin;
-
-          if ($core->blog->settings->qrc_api_out_enc)
-               $this->qrc_api_out_enc = $core->blog->settings->qrc_api_out_enc;
+          if ($core->blog->settings->dcQRcode->qrc_api_url)
+          {
+               $this->qrc_api_url = $core->blog->settings->dcQRcode->qrc_api_url;
+          }
+          if ($core->blog->settings->dcQRcode->qrc_api_ec_level)
+          {
+               $this->qrc_api_ec_level = $core->blog->settings->dcQRcode->qrc_api_ec_level;
+          }
+          if ($core->blog->settings->dcQRcode->qrc_api_ec_margin)
+          {
+               $this->qrc_api_ec_margin = $core->blog->settings->dcQRcode->qrc_api_ec_margin;
+          }
+          if ($core->blog->settings->dcQRcode->qrc_api_out_enc)
+          {
+               $this->qrc_api_out_enc = $core->blog->settings->dcQRcode->qrc_api_out_enc;
+          }
      }
 

plugins/dcQRcode/index.php

@@ -15 +15 @@
 dcPage::check('admin');
 
-$s =& $core->blog->settings;
+$s = $core->blog->settings->dcQRcode;
 
 $tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : 'qrc_settings';
 $_REQUEST['nb_per_page'] =  $s->qrc_nb_per_page;
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
+if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0)
+{
      $_REQUEST['nb_per_page'] = (integer) $_GET['nb'];
 }
@@ -53 +54 @@
      try
      {
-          $s->setNamespace('dcQRcode');
           $s->put('qrc_active',isset($_POST['qrc_active']));
           $s->put('qrc_use_mebkm',isset($_POST['qrc_use_mebkm']));
@@ -75 +75 @@
                $s->put('qrc_cache_path',$_POST['qrc_cache_path']);
           }
-          $s->setNamespace('system');
 
           $qrc->cleanCache();
@@ -236 +235 @@
 <?php
 
-if ($core->blog->settings->qrc_active)
+if ($s->qrc_active)
 {
      dcQRcodeIndexLib::txtTab($core,$qrc);
@@ -256 +255 @@
 ?>
   <hr class="clear"/>
-  <p class="right">
+  <p class="right"><a class="button" href="<?php echo $p_url;?>&amp;t=qrc_settings"><?php echo __('Settings'); ?></a> - 
    dcQRcode - <?php echo $core->plugins->moduleInfo('dcQRcode','version'); ?>&nbsp;
    <img alt="dcQRcode" src="index.php?pf=dcQRcode/icon.png" />

plugins/dcQRcode/release.txt

@@ +1 @@
+0.7 20100606
+ * Switched to DC 2.2
+ * Fixed use of MEBKM on widget
+
 0.6.1 20100130
  * Fixed URL decode before query database