Changeset 1220:4358ca8a7184

Timestamp:

07/18/13 13:52:55 (12 years ago)

Author:

akewea

Branch:

ticket1084

Message:

ticket #1084 : passage des attachments en staticRecord pour permettre l'utilisation de <tpl:LoopPosition>.

Files:

• inc/core/class.dc.media.php (modified) (1 diff)
• plugins/attachments/_public.php (modified) (12 diffs)

inc/core/class.dc.media.php

@@ -515 +515 @@
                $f = $this->fileRecord($rs);
                if ($f !== null) {
-                    $res[] = $f;
+                    $res[] = new ArrayObject($f);
                }
           }

plugins/attachments/_public.php

@@ -40 +40 @@
           "<?php\n".
           'if ($_ctx->posts !== null && $core->media) {'."\n".
-               '$_ctx->attachments = new ArrayObject($core->media->getPostMedia($_ctx->posts->post_id));'."\n".
+          '$_ctx->attachments = staticRecord::newFromArray($core->media->getPostMedia($_ctx->posts->post_id));'."\n".
           "?>\n".
           
-          '<?php foreach ($_ctx->attachments as $attach_i => $attach_f) : '.
-          '$GLOBALS[\'attach_i\'] = $attach_i; $GLOBALS[\'attach_f\'] = $attach_f;'.
-          '$_ctx->file_url = $attach_f->file_url; ?>'.
-          $content.
-          '<?php endforeach; $_ctx->attachments = null; unset($attach_i,$attach_f,$_ctx->file_url); ?>'.
+          '<?php $attach_i = 0; ?>'. // LEGACY
+          '<?php while ($_ctx->attachments->fetch()) : ?>'.
+          
+          '<?php $GLOBALS[\'attach_i\'] = $attach_i++; $GLOBALS[\'attach_f\'] = $_ctx->attachments->row();'. // LEGACY
+          '$_ctx->file_url = $_ctx->attachments->file_url; ?>'. // LEGACY
+          
+          $content.'<?php endwhile; '.
+          '$_ctx->attachments = null; ?>'.
           
           "<?php } ?>\n";
@@ -60 +63 @@
      {
           return
-          "<?php if (\$attach_i == 0) : ?>".
+          "<?php if (\$_ctx->attachments->isStart()) : ?>".
           $content.
           "<?php endif; ?>";
@@ -71 +74 @@
      {
           return
-          "<?php if (\$attach_i+1 == count(\$_ctx->attachments)) : ?>".
+          "<?php if (\$_ctx->attachments->isEnd()) : ?>".
           $content.
           "<?php endif; ?>";
@@ -93 +96 @@
           if (isset($attr['is_image'])) {
                $sign = (boolean) $attr['is_image'] ? '' : '!';
-               $if[] = $sign.'$attach_f->media_image';
+               $if[] = $sign.'$_ctx->attachments->media_image';
           }
           
           if (isset($attr['has_thumb'])) {
                $sign = (boolean) $attr['has_thumb'] ? '' : '!';
-               $if[] = $sign.'isset($attach_f->media_thumb[\'sq\'])';
+               $if[] = $sign.'isset($_ctx->attachments->media_thumb[\'sq\'])';
           }
           
           if (isset($attr['is_mp3'])) {
                $sign = (boolean) $attr['is_mp3'] ? '==' : '!=';
-               $if[] = '$attach_f->type '.$sign.' "audio/mpeg3"';
+               $if[] = '$_ctx->attachments->type '.$sign.' "audio/mpeg3"';
           }
           
@@ -109 +112 @@
                $sign = (boolean) $attr['is_flv'] ? '' : '!';
                $if[] = $sign.
-                    '($attach_f->type == "video/x-flv" || '.
-                    '$attach_f->type == "video/mp4" || '.
-                    '$attach_f->type == "video/x-m4v")';
+                    '($_ctx->attachments->type == "video/x-flv" || '.
+                    '$_ctx->attachments->type == "video/mp4" || '.
+                    '$_ctx->attachments->type == "video/x-m4v")';
           }
           
@@ -127 +130 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$attach_f->type').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->attachments->type').'; ?>';
      }
      
@@ -136 +139 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$attach_f->media_type').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->attachments->media_type').'; ?>';
      }
      
@@ -145 +148 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$attach_f->basename').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->attachments->basename').'; ?>';
      }
      
@@ -158 +161 @@
           $f = $GLOBALS['core']->tpl->getFilters($attr);
           if (!empty($attr['full'])) {
-               return '<?php echo '.sprintf($f,'$attach_f->size').'; ?>';
-          }
-          return '<?php echo '.sprintf($f,'files::size($attach_f->size)').'; ?>';
+               return '<?php echo '.sprintf($f,'$_ctx->attachments->size').'; ?>';
+          }
+          return '<?php echo '.sprintf($f,'files::size($_ctx->attachments->size)').'; ?>';
      }
      
@@ -169 +172 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$attach_f->media_title').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->attachments->media_title').'; ?>';
      }
      
@@ -180 +183 @@
           return
           '<?php '.
-          'if (isset($attach_f->media_thumb[\'sq\'])) {'.
-               'echo '.sprintf($f,'$attach_f->media_thumb[\'sq\']').';'.
+          'if (isset($_ctx->attachments->media_thumb[\'sq\'])) {'.
+               'echo '.sprintf($f,'$_ctx->attachments->media_thumb[\'sq\']').';'.
           '}'.
           '?>';
@@ -192 +195 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$attach_f->file_url').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->attachments->file_url').'; ?>';
      }