Changeset 43

Timestamp:

03/15/06 14:01:59 (2 years ago)

Author:

eadiaz

Message:

Support for youtube video content.
In the future we will enable more content type, we are using the is_micro_content field, 0 = url, 1=plain text (no url), 2=youtube video.

Files:

• trunk/public_html/akarru.lib/memes.php (modified) (5 diffs)
• trunk/public_html/post.php (modified) (5 diffs)
• trunk/smarty/configs/site.conf (modified) (2 diffs)
• trunk/smarty/templates/comment.tpl (modified) (1 diff)
• trunk/smarty/templates/memes_grid.tpl (modified) (1 diff)
• trunk/smarty/templates/post_1.tpl (modified) (1 diff)
• trunk/smarty/templates/post_2.tpl (modified) (1 diff)
• trunk/smarty/templates/post_3.tpl (modified) (2 diffs)

trunk/public_html/akarru.lib/memes.php

@@ -2 +2 @@
-include_once('lib/xmlrpc.inc');
-include_once('lib/xmlrpcs.inc');
+
+  function get_youtube($url)
+  {
+          $matches = array();
+          @preg_match('/v=(.*)$/', $url, $matches);
+          if (empty($matches[1])) {
+                  return '';
+          }
+          $url = 'http://youtube.com/v/'.$matches[1];
+          return '<object width="300" height="250"><param name="movie" value="'.$url.'"></param><embed src="'.$url.'" type="application/x-shockwave-flash" width="300" height="250"></embed></object>'; 
+  }
-
-class memes {
@@ -82 +93 @@
-        function get_meme($id)
-        {
-
+is_micro_content,p.
-                $sql .= ' and p.ID='.$id;
-                $result = $this->db->fetch_object($sql);
-                $result->small_gravatar = get_gravatar($bm_url, $result->email, 16); 
+                if ($result->is_micro_content == 2) {
+                        $result->micro_content = get_youtube($result->url);
+                }
-                return $result;
-        }
@@ -106 +120 @@
-        function get_comments($meme_id)
-        {
- '
+, c.post_id as ID ' 
-                $sql .= ' from post_comments c left join users u on c.user_id = u.ID ';
-                $sql .= ' where post_id = '.$meme_id;
@@ -196 +210 @@
-                        $meme_id = $meme->ID;
-                        $uid = $this->user_id;
-empty($u
-uid = 0
+!empty($uid) && !empty($meme_
+meme->voted = $this->db->fetch_scalar("select count(*) from post_votes where post_id = $meme_id and user_id = $uid ")
-                        }
-
+
+
+
+
-                        $result[] = $meme;
-                }
@@ -305 +322 @@
-                $date_posted = time();
-                $trackback = $data['meme_trackback'];
-
-
+
+
+
-                if ($this->db->execute($sql))
-                {

trunk/public_html/post.php

@@ -32 +32 @@
-                 $title = $_POST['title'];
-                 $url   = $_POST['url'];
+                 $smarty->assign('content_type',  $_POST['content_type']);
-                 if (empty($title)) {
-                         $smarty->assign('error_title', true);
@@ -58 +59 @@
-         }
-         elseif ($_POST['step'] == 2) {
+                 $smarty->assign('content_type',  $_POST['content_type']);
-                 $title = $_POST['title'];
-                 $url   = $_POST['url'];
@@ -81 +83 @@
-                 $smarty->assign('meme_trackback', check_plain($meme_trackback));
-                 $smarty->assign('meme_tags', check_plain($meme_tags));
+                 $smarty->assign('micro_content', get_youtube($url));
-                 if ($bm_errors == 0) {
-                         $step = 3;
@@ -91 +94 @@
-         }
-         else if ($_POST['step'] == 3) {
+                 $smarty->assign('content_type',  $_POST['content_type']);
-                 if (!empty($_POST['do_edit'])) {
-                         $step = 2;
@@ -109 +113 @@
-                         $smarty->assign('meme_tags', check_plain($meme_tags));
-                         $smarty->assign('cats', $bm_options);
+                         $smarty->assign('micro_content', get_youtube($url));
-                 }
-                 else

trunk/smarty/configs/site.conf

@@ -1 +1 @@
-site_caption="Blog Memes"
-promote_label_url="promueve noticias"
-una noticia
+contenido
-popular_label_url="lo más popular"
-unpopular_label_url="lo menos popular"
@@ -38 +38 @@
-label_register_submit="registra cuenta"
-label_recover_pass_submit="recuperar email"
-
+
-post_instructions='un meme es una unidad de transmisión cultural'
-post_criteria='<ul><li><b>Calidad del contenido </b>¿Es relevante o interesante la historia que estás publicando?</li><li><b>¿Está escrita en Castellano o Español?</b></li><li><b>Se descriptivo:</b> Eres tu propio editor, se breve y explica porqué la historia a publicar es relevante.</li></ul>'

trunk/smarty/templates/comment.tpl

@@ -23 +23 @@
-        {if $meme->vote_count > 7}&nbsp;|&nbsp <a href="circulation.php?meme_id={$meme->ID}">circulaci&oacute;n</a>{/if}</div>
-        </div>
+        {if $meme->micro_content}
+        <div style="padding:2px">{$meme->micro_content}</div>
+        {/if}
+        
-          <p>
-                  {$meme->content|nl2br}

trunk/smarty/templates/memes_grid.tpl

@@ -32 +32 @@
-         {$meme->date_posted|date_format:$bf_date_posted} 
-        {if $meme->vote_count > 7}&nbsp;|&nbsp <a href="circulation.php?meme_id={$meme->ID}">circulaci&oacute;n</a>{/if}</div>
+        
-        <p style="right-margin:1em">
+        {if $meme->micro_content}
+        <div style="padding:4px">{$meme->micro_content}</div>
+        {/if}
-                  {$meme->content|nl2br}
-          </p>

trunk/smarty/templates/post_1.tpl

@@ -17 +17 @@
-{if $error_duplicate_url}<tr><td class="error">{#error_duplicate_url#}</td></tr>{/if}
-{if $error_url}<tr><td class="error">{#error_url#}</td></tr>{/if}
+<tr><td class="view-label-class">{#label_content_type#}</td></tr>
+<tr><td>
+        <select class="view-input-class" name="content_type">
+                <option value="0" selected="selected">url</option>
+                <option value="2">youtube</option>
+        </select>
+</td></tr>
-<tr><td><input type="hidden" name="step" value="{$step}" /><input class="view-button-class" type="submit" value="{#post_submit_label#}" name="do_post" />
-</table>

trunk/smarty/templates/post_2.tpl

@@ -18 +18 @@
-<tr><td><input class="view-input-class" value="{$meme_trackback}" name="meme_trackback" size="60" /></td></tr>
-{if $error_trackback}<tr><td class="error">{#error_trackback#}</td></tr>{/if}
-
+content_type" value="{$content_type}" /><input type="hidden" name="
-<input class="view-button-class" type="submit" value="{#post_submit_label#}" name="do_post" />
-</td></tr>

trunk/smarty/templates/post_3.tpl

@@ -22 +22 @@
-        style="font-size:10px" href="profile.php?user_name={$logged_username}">{$logged_username}</a>
-        &nbsp;{$meme->date_posted|date_format:$bf_date_posted}</div>
+        {if $micro_content}
+        <div style="padding:2px">{$micro_content}</div>
+        {/if}
-          <p>
-                  {$content_body|nl2br}
@@ -30 +33 @@
-        {if $meme_tags}etiquetas: {$meme_tags} &nbsp;|&nbsp; {/if}<input type="hidden" name="meme_tags" value="{$meme_tags}" /> {if $meme_trackback}| <a href="{$meme_trackback}" alt="{$meme_trackback}">trackback</a><input type="hidden" name="meme_trackback" value="{$meme_trackback}" />&nbsp;{/if}
-        <input type="hidden" name="step" value="{$step}" /> 
+        <input type="hidden" name="content_type" value="{$content_type}" />
-        </div></td>
-  </tr>