Added support for posts types

bitcero · bitcero · commit 356f0c3ef5ce · 2014-07-02T21:43:18.000-05:00
diff --git a/mywords/admin/ajax/ax-posts.php b/mywords/admin/ajax/ax-posts.php
@@ -93,7 +93,7 @@ function return_error($msg, $token=true, $redirect=''){
 }
 
 // Check content
-if ($content==''){
+if ($content=='' && $format != 'image'){
     return_error(__('Content for this post has not been provided!','mywords'), true);
     die();
 }
diff --git a/mywords/admin/ajax/index.html b/mywords/admin/ajax/index.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+	history.go(-1);
+</script>
diff --git a/mywords/css/admin.css b/mywords/css/admin.css
@@ -97,17 +97,9 @@ td.mw_cat_description{
 	color: #333;
 }
 div.mw_messages_post{
-    background: #fbec88;
-    padding: 5px;
     text-align: center;
-    border: 1px solid #fad42e;
     display: none;
-    -moz-border-radius: 5px;
-    -khtml-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
     margin-bottom: 10px;
-    color: #363636;
 }
 div.messages_error{
     background: #cd0a0a;
diff --git a/mywords/css/index.html b/mywords/css/index.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+	history.go(-1);
+</script>
diff --git a/mywords/docs/index.html b/mywords/docs/index.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+	history.go(-1);
+</script>
diff --git a/mywords/events/index.html b/mywords/events/index.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+	history.go(-1);
+</script>
diff --git a/mywords/images/icons/index.html b/mywords/images/icons/index.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+	history.go(-1);
+</script>
diff --git a/mywords/include/js/index.html b/mywords/include/js/index.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+	history.go(-1);
+</script>
diff --git a/mywords/include/js/posts.js b/mywords/include/js/posts.js
@@ -368,10 +368,10 @@ $(document).ready( function($) {
             tinyMCE.activeEditor.save();
         }
         
-        if ($("#content").val()==''){
+        /*if ($("#content").val()==''){
             alert('<?php _e('Add content before to save this post','mywords'); ?>');
             return false;
-        }
+        }*/
         
         // Serialize all data
         var params = $("form#mw-form-posts").serialize();
@@ -388,7 +388,7 @@ $(document).ready( function($) {
         $.post('<?php echo XOOPS_URL; ?>/modules/mywords/admin/ajax/ax-posts.php', params, function(data){
             
             if(data['error']!=undefined && data['error']!=''){
-                $('div#mw-messages-post').addClass('messages_error');
+                $('div#mw-messages-post').addClass('alert-danger');
                 $('div#mw-messages-post').html(data['error']);
                 $('div#mw-messages-post').slideDown();
                 if(data['token'])
diff --git a/mywords/post.php b/mywords/post.php
@@ -95,13 +95,6 @@
 
 $xoopsTpl->assign('lang_reads', sprintf(__('%u views','mywords'), $post->getVar('reads')));
 
-// Tags
-$tags = $post->tags(true);
-$tags_list = '';
-foreach($tags as $i => $tag){
-    $tags_list .= ($tags_list==''?'':', ').'<a href="'.$tag->permalink().'">'.$tag->getVar('tag').'</a>';
-}
-
 // Post pages
 $total_pages = $post->total_pages();
 $nav = new RMPageNav($total_pages, 1, $page, 5);
@@ -115,8 +108,8 @@
     'title'     => $post->getVar('title'),
     'published' => sprintf(__('%s by %s','mywords'), MWFunctions::format_time($post->getVar('pubdate')) . ' ' . date('H:i',$post->getVar('pubdate')),'<a href="'.$editor->permalink().'">'.(isset($editor) ? $editor->getVar('name') : __('Anonymous','mywords'))."</a>"),
     'text'      => $post->content(false, $page),
-    'cats'      => $post->get_categories_names(),
-    'tags'      => $tags_list,
+    'cats'      => $post->get_categos('data'),
+    'tags'      => $post->tags(false),
     'trackback' => $post->getVar('pingstatus') ? MWFunctions::get_url(true).$post->id() : '',
     'meta'      => $post->get_meta('', false),
     'time'      => $post->getVar('pubdate'),
@@ -128,9 +121,16 @@
                     'bio'   => $editor->getVar('bio'),
                     'email' => $editor->data('email')
                    ),
-    'alink'     => $editor->permalink()
+    'alink'     => $editor->permalink(),
+    'format'    => $post->format
 );
 
+$xoopsTpl->assign('full_post', 1);
+$xoopsTpl->assign('lang_editpost', __('Edit Post','mywords'));
+$xoopsTpl->assign('lang_postedin', __('Posted in:','mywords'));
+$xoopsTpl->assign('lang_taggedas', __('Tagged as:','mywords'));
+$xoopsTpl->assign('enable_images', $xoopsModuleConfig['list_post_imgs']);
+
 // Plugins?
 $post_arr = RMEvents::get()->run_event('mywords.view.post', $post_arr, $post);
 $xoopsTpl->assign('post', $post_arr);
diff --git a/mywords/post_data.php b/mywords/post_data.php
@@ -14,7 +14,7 @@
 }
 
 // Authors cache
-$authors = array();
+$editors = array();
 
 while ($row = $db->fetchArray($result)){
 	
@@ -27,15 +27,14 @@
     $link = $post->permalink();
     # Generamos el vínculo para el autor
     if ($post->getVar('author')>0){
-    	if(!isset($authors[$post->getVar('author')])) $authors[$post->getVar('author')] = new MWEditor($post->getVar('author'));
-    	$author = $authors[$post->getVar('author')];
-    	$alink = $author->permalink();
+    	if(!isset($editors[$post->getVar('author')])) $editors[$post->getVar('author')] = new MWEditor($post->getVar('author'));
+        $editor = $editors[$post->getVar('author')];
     } else {
 		$alink = '';
     }
     
     # Información de Publicación
-    $published = sprintf(__('%s by %s', 'mywords'), MWFunctions::format_time($post->getVar('pubdate'),'string'), '<a href="'.$alink.'">'.(isset($author) ? $author->getVar('name') : __('Anonymous','mywords'))."</a>");
+    $published = sprintf(__('%s by %s', 'mywords'), MWFunctions::format_time($post->getVar('pubdate'),'string'), '<a href="'.$alink.'">'.(isset($editor) ? $editor->name : __('Anonymous','mywords'))."</a>");
     # Texto de continuar leyendo
     if ($post->getVar('visibility')=='password'){
         $text = isset($_SESSION['password-'.$post->id()]) && $_SESSION['password-'.$post->id()]==$post->getVar('password') ? $post->content(true) : MWFunctions::show_password($post);
@@ -65,7 +64,13 @@
         'lang_continue'		=> $post->hasmore_text() ? sprintf(__('Read more about "%s"','mywords'), $post->getVar('title')) : '',
         'bookmarks'         =>$bms,
         'time'              =>$post->getVar('pubdate'),
-        'author'            =>$authors[$post->getVar('author')]->getVar('name'),
+        'author'            =>array(
+                                'name'  => $editor->getVar('name'),
+                                'id'    => $editor->id(),
+                                'link'  => $editor->permalink(),
+                                'bio'   => $editor->getVar('bio'),
+                                'email' => $editor->data('email')
+                            ),
         'alink'				=>$alink,
         'edit'              => $xoopsUser && ($xoopsUser->isAdmin() || $author->getVar('uid')==$xoopsUser->uid()),
         'tags'              => $post->tags(false),
diff --git a/mywords/templates/admin/mywords_formposts.php b/mywords/templates/admin/mywords_formposts.php
@@ -1,5 +1,5 @@
 <h1 class="cu-section-title mw_titles"><?php $edit ? _e('Edit Post','mywords') : _e('Create Post','mywords'); ?></h1>
-<div id="mw-messages-post" class="mw_messages_post">
+<div id="mw-messages-post" class="alert alert-danger mw_messages_post">
 
 </div>
 <form name="mwposts" id="mw-form-posts" action="posts.php" method="post">
diff --git a/mywords/templates/formats/gallery.tpl b/mywords/templates/formats/gallery.tpl
@@ -0,0 +1,41 @@
+<article class="mwitem mw-gallery-post" id="mwitem-<{$post.id}>">
+    <header>
+        <h1><a href="<{$post.link}>"><{$post.title}></a></h1>
+	    <span class="mwinfotop">
+	        <span class="mwcomments">
+	            <a href="<{$post.link}>#comments"><{$post.lang_comments}></a> |
+	        </span>
+	        <{$post.published }> <{if ($post.edit)}>| <a href="<{if $xoops_isadmin}><{$xoops_url}>/modules/mywords/admin/posts.php?op=edit&amp;id=<{$post.id}><{else}><{$xoops_url}>/modules/mywords/submit.php?action=edit&amp;id=<{$post.id}><{/if}>"><{$lang_editpost}></a><{/if}>
+	    </span>
+    </header>
+    <section class="mwtext">
+        <{$post.text}>
+        <{if ($post.continue) }><span class="mwcontinue"><a href="<{$post.link}>#mwmore"><{$post.lang_continue}></a></span><{/if}>
+    </section>
+    <footer class="mwfoot">
+        <span class="mwcats">
+        <{if ($post.cats) }>
+            <{$lang_postedin}>
+            <{assign var="i" value=0}>
+            <{foreach item=cat from=$post.cats}>
+                <a href="<{$cat.permalink}>"><{$cat.name}></a><{if ($i<count($post.cats)-1)}>, <{else}><{/if}>
+                <{assign var="i" value=$i+1}>
+            <{/foreach}>
+        <{/if}>
+        </span>
+        <span class="mwtags">
+        <{$lang_taggedas}>
+        <{foreach item=tag from=$post.tags key=i}>
+            <a href="<{$tag.permalink}>"><{$tag.tag}></a><{if ($i<count($post.tags)-1)}>, <{else}><{/if}>
+        <{/foreach}>
+        </span>
+        <span class="mwbooks">
+        <{if ($post.bookmarks) }>
+            <{foreach item=bm from=$post.bookmarks key=i}>
+                <a href="javascript:;" onclick="mwOpenWindow('<{$bm.link}>','bookmark',600,400);" title="<{$bm.alt}>"><img src="<{$xoops_url}>/modules/mywords/images/icons/<{$bm.icon}>" alt="<{$bm.alt}>" /></a>
+            <{/foreach}>
+        <{/if}>
+        </span>
+    </footer>
+
+</article>
diff --git a/mywords/templates/formats/image.tpl b/mywords/templates/formats/image.tpl
@@ -0,0 +1,53 @@
+<article class="mwitem mw-image-post" id="mwitem-<{$post.id}>">
+    <header>
+        <{if $full_post}>
+            <h1><{$post.title}></h1>
+        <{else}>
+            <h1><a href="<{$post.link}>"><{$post.title}></a></h1>
+        <{/if}>
+
+	    <span class="mwinfotop">
+	        <span class="mwcomments">
+	            <a href="<{$post.link}>#comments"><{$post.lang_comments}></a> |
+	        </span>
+	        <{$post.published }> <{if ($post.edit)}>| <a href="<{if $xoops_isadmin}><{$xoops_url}>/modules/mywords/admin/posts.php?op=edit&amp;id=<{$post.id}><{else}><{$xoops_url}>/modules/mywords/submit.php?action=edit&amp;id=<{$post.id}><{/if}>"><{$lang_editpost}></a><{/if}>
+	    </span>
+    </header>
+    <section class="mwtext">
+        <{if $enable_images}>
+            <{if $full_post}>
+                <img src="<{$post.image}>" alt="<{$post.title}>" class="img-responsive" />
+            <{else}>
+                <a href="<{$post.link}>" title="<{$post.title}>"><img src="<{$post.image}>" alt="<{$post.title}>" class="img-responsive" /></a>
+            <{/if}>
+        <{/if}>
+        <{if $post.text!=''}><{$post.text}><{/if}>
+        <{if ($post.continue) }><span class="mwcontinue"><a href="<{$post.link}>#mwmore"><{$post.lang_continue}></a></span><{/if}>
+    </section>
+    <footer class="mwfoot">
+        <span class="mwcats">
+        <{if ($post.cats) }>
+            <{$lang_postedin}>
+            <{assign var="i" value=0}>
+            <{foreach item=cat from=$post.cats}>
+                <a href="<{$cat.permalink}>"><{$cat.name}></a><{if ($i<count($post.cats)-1)}>, <{else}><{/if}>
+                <{assign var="i" value=$i+1}>
+            <{/foreach}>
+        <{/if}>
+        </span>
+        <span class="mwtags">
+        <{$lang_taggedas}>
+        <{foreach item=tag from=$post.tags key=i}>
+            <a href="<{$tag.permalink}>"><{$tag.tag}></a><{if ($i<count($post.tags)-1)}>, <{else}><{/if}>
+        <{/foreach}>
+        </span>
+        <span class="mwbooks">
+        <{if ($post.bookmarks) }>
+            <{foreach item=bm from=$post.bookmarks key=i}>
+                <a href="javascript:;" onclick="mwOpenWindow('<{$bm.link}>','bookmark',600,400);" title="<{$bm.alt}>"><img src="<{$xoops_url}>/modules/mywords/images/icons/<{$bm.icon}>" alt="<{$bm.alt}>" /></a>
+            <{/foreach}>
+        <{/if}>
+        </span>
+    </footer>
+
+</article>
diff --git a/mywords/templates/formats/index.html b/mywords/templates/formats/index.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+	history.go(-1);
+</script>
diff --git a/mywords/templates/formats/link.tpl b/mywords/templates/formats/link.tpl
@@ -0,0 +1,44 @@
+<article class="mwitem" id="mwitem-<{$post.id}>">
+    <header>
+        <h1><a href="<{$post.link}>"><{$post.title}></a></h1>
+	    <span class="mwinfotop">
+	        <span class="mwcomments">
+	            <a href="<{$post.link}>#comments"><{$post.lang_comments}></a> |
+	        </span>
+	        <{$post.published }> <{if ($post.edit)}>| <a href="<{if $xoops_isadmin}><{$xoops_url}>/modules/mywords/admin/posts.php?op=edit&amp;id=<{$post.id}><{else}><{$xoops_url}>/modules/mywords/submit.php?action=edit&amp;id=<{$post.id}><{/if}>"><{$lang_editpost}></a><{/if}>
+	    </span>
+    </header>
+    <section class="mwtext">
+        <{if $enable_images}>
+        <a href="<{$post.link}>" title="<{$post.title}>"><img src="<{$post.image}>" alt="<{$post.title}>" class="post_image" /></a>
+        <{/if}>
+        <{$post.text}>
+        <{if ($post.continue) }><span class="mwcontinue"><a href="<{$post.link}>#mwmore"><{$post.lang_continue}></a></span><{/if}>
+    </section>
+    <footer class="mwfoot">
+        <span class="mwcats">
+        <{if ($post.cats) }>
+            <{$lang_postedin}>
+            <{assign var="i" value=0}>
+            <{foreach item=cat from=$post.cats}>
+                <a href="<{$cat.permalink}>"><{$cat.name}></a><{if ($i<count($post.cats)-1)}>, <{else}><{/if}>
+                <{assign var="i" value=$i+1}>
+            <{/foreach}>
+        <{/if}>
+        </span>
+        <span class="mwtags">
+        <{$lang_taggedas}>
+        <{foreach item=tag from=$post.tags key=i}>
+            <a href="<{$tag.permalink}>"><{$tag.tag}></a><{if ($i<count($post.tags)-1)}>, <{else}><{/if}>
+        <{/foreach}>
+        </span>
+        <span class="mwbooks">
+        <{if ($post.bookmarks) }>
+            <{foreach item=bm from=$post.bookmarks key=i}>
+                <a href="javascript:;" onclick="mwOpenWindow('<{$bm.link}>','bookmark',600,400);" title="<{$bm.alt}>"><img src="<{$xoops_url}>/modules/mywords/images/icons/<{$bm.icon}>" alt="<{$bm.alt}>" /></a>
+            <{/foreach}>
+        <{/if}>
+        </span>
+    </footer>
+
+</article>
diff --git a/mywords/templates/formats/mini.tpl b/mywords/templates/formats/mini.tpl
@@ -0,0 +1,44 @@
+<article class="mwitem mw-mini-post" id="mwitem-<{$post.id}>">
+    <header>
+        <h1><a href="<{$post.link}>"><{$post.title}></a></h1>
+	    <span class="mwinfotop">
+	        <span class="mwcomments">
+	            <a href="<{$post.link}>#comments"><{$post.lang_comments}></a> |
+	        </span>
+	        <{$post.published }> <{if ($post.edit)}>| <a href="<{if $xoops_isadmin}><{$xoops_url}>/modules/mywords/admin/posts.php?op=edit&amp;id=<{$post.id}><{else}><{$xoops_url}>/modules/mywords/submit.php?action=edit&amp;id=<{$post.id}><{/if}>"><{$lang_editpost}></a><{/if}>
+	    </span>
+    </header>
+    <section class="mwtext">
+        <{if $enable_images}>
+        <a href="<{$post.link}>" title="<{$post.title}>"><img src="<{$post.image}>" alt="<{$post.title}>" class="post_image" /></a>
+        <{/if}>
+        <{$post.text}>
+        <{if ($post.continue) }><span class="mwcontinue"><a href="<{$post.link}>#mwmore"><{$post.lang_continue}></a></span><{/if}>
+    </section>
+    <footer class="mwfoot">
+        <span class="mwcats">
+        <{if ($post.cats) }>
+            <{$lang_postedin}>
+            <{assign var="i" value=0}>
+            <{foreach item=cat from=$post.cats}>
+                <a href="<{$cat.permalink}>"><{$cat.name}></a><{if ($i<count($post.cats)-1)}>, <{else}><{/if}>
+                <{assign var="i" value=$i+1}>
+            <{/foreach}>
+        <{/if}>
+        </span>
+        <span class="mwtags">
+        <{$lang_taggedas}>
+        <{foreach item=tag from=$post.tags key=i}>
+            <a href="<{$tag.permalink}>"><{$tag.tag}></a><{if ($i<count($post.tags)-1)}>, <{else}><{/if}>
+        <{/foreach}>
+        </span>
+        <span class="mwbooks">
+        <{if ($post.bookmarks) }>
+            <{foreach item=bm from=$post.bookmarks key=i}>
+                <a href="javascript:;" onclick="mwOpenWindow('<{$bm.link}>','bookmark',600,400);" title="<{$bm.alt}>"><img src="<{$xoops_url}>/modules/mywords/images/icons/<{$bm.icon}>" alt="<{$bm.alt}>" /></a>
+            <{/foreach}>
+        <{/if}>
+        </span>
+    </footer>
+
+</article>
diff --git a/mywords/templates/formats/post.tpl b/mywords/templates/formats/post.tpl
diff --git a/mywords/templates/formats/quote.tpl b/mywords/templates/formats/quote.tpl
diff --git a/mywords/templates/formats/video.tpl b/mywords/templates/formats/video.tpl
diff --git a/mywords/templates/mywords_post.html b/mywords/templates/mywords_post.html
diff --git a/mywords/templates/mywords_single_post.html b/mywords/templates/mywords_single_post.html
diff --git a/mywords/widgets/index.html b/mywords/widgets/index.html
diff --git a/mywords/xoops_version.php b/mywords/xoops_version.php

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ function return_error($msg, $token=true, $redirect=''){`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// Check content`
`96`		`-if ($content==''){`
	`96`	`+if ($content=='' && $format != 'image'){`
`97`	`97`	`return_error(__('Content for this post has not been provided!','mywords'), true);`
`98`	`98`	`die();`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<script type="text/javascript">`
	`2`	`+ history.go(-1);`
	`3`	`+</script>`