Changeset 19048

Timestamp:

Nov 16, 2012, 11:33:14 AM (12 years ago)

Author:

EvilKant

Message:

 

Location:

extensions/Evil_Blog

Files:

• blog.tpl (copied) (copied from extensions/Evil_Blog/posts.tpl) (2 diffs)
• feed.php (added)
• main.inc.php (modified) (7 diffs)
• maintain.inc.php (modified) (3 diffs)

extensions/Evil_Blog/blog.tpl

@@ -1 +1 @@
                 {$TITLE}
+                <a href="{$ROOT_URL}/?blog/feed" title="{'Notification'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/RSS.png"></a>
                 <ul class="evil_blog_posts">
                         {foreach from=$row item=value} 
@@ -21 +22 @@
                 </ul>
                 
-                <script type="text/javascript">{literal}                
-                function subnum (num) {
-                        document.blog_pagination.npage.value=num;
-                        document.blog_pagination.submit();
-                }
-                {/literal}
-                </script>
-                <form name='blog_pagination' action='' method='POST'>
+                {if $pages>1}
                 <div class="navigationBar">
-                        <a href="{$first_page}" rel="first">{'First'|@translate}</a> |
-                        <a href="#" onclick='subnum({$npage-1})' rel="prev">{'Previous'|@translate}</a> |
-                        <input type='text' name='npage' style='visibility: hidden; position: absolute;'>
+                        {if $npage!=1}
+                                <a href="{$ROOT_URL}?/blog/1" rel="first">{'First'|@translate}</a> |
+                                <a href="{$ROOT_URL}?/blog/{$npage-1}" rel="prev">{'Previous'|@translate}</a> |
+                                {/if}
                         {foreach from=$pagi item=v}
                                 {if $v!=$npage}
-                                        <a class='blog_pagination' href='#' onclick='subnum({$v})'>{$v}</a> |
+                                        <a class='blog_pagination' href="{$ROOT_URL}?/blog/{$v}">{$v}</a> |
                                         {else}
                                         <span class='pageNumberSelected'>{$v}</span> |
                                         {/if}
                         {/foreach}
-                        <a href="#" onclick='subnum({$npage+1})' rel="next">{'Next'|@translate}</a> |
-                        <a href="#" onclick='subnum({$pages})' rel="last">{'Last'|@translate}</a>
+                        {if $npage!=$pages}
+                                <a href="{$ROOT_URL}?/blog/{$npage+1}" rel="next">{'Next'|@translate}</a> |
+                                <a href="{$ROOT_URL}?/blog/{$pages}" rel="last">{'Last'|@translate}</a>
+                                {/if}
                 </div>
-                </form>
+                {/if}
 {$TITLE_END}

extensions/Evil_Blog/main.inc.php

@@ -1 +1 @@
 <?php
 /*
-Version: 1.1.2
+Version: 1.2.0
 Plugin Name: Evil_Blog
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=611
@@ -53 +53 @@
         
         if (((empty($tokens[0])) and ($page['evil_blog']['show_on_main_page'])) or 
-                ((!$page['evil_blog']['show_on_main_page']) and($tokens[0]=='blog'))) {//если дело происходит на главной странице, то...
-                
+                ($tokens[0]=='blog')) {//если дело происходит на главной странице, то...
+                //RSS
+                if ((!empty($tokens[1])) and ($tokens[1]=="feed")) { 
+                        include_once (Evil_Blog_PATH.'feed.php');
+                        } else {
+                        
                 $post_per_page = $page['evil_blog']['posts_per_page'];
                 //узнаем количество записей в блоге
@@ -62 +66 @@
                         $pages = floor($row["COUNT(*)"] / $post_per_page)+1;
                         } else {$pages = floor($row["COUNT(*)"] / $post_per_page);}
-                if ((empty($_POST['npage'])) or ($_POST['npage']<=1)) {
+                if ((empty($tokens[1])) or ($tokens[1]<=1)) {
                         $number = 0;
                         $npage = 1;
                         } else {
-                                $npage = $_POST['npage'];
+                                $npage = $tokens[1];
                                 if ($npage<=$pages) {
                                         $number=($npage-1)*$post_per_page;
@@ -104 +108 @@
                         }
                 //определяем заголовок
-                if ($page['evil_blog']['show_on_main_page']) {
+                if (($page['evil_blog']['show_on_main_page']) and ($tokens[0]!='blog')) {
                         $place = 'PLUGIN_INDEX_CONTENT_BEFORE';
                         $template->assign('TITLE', '<div id="content" class="content contentWithMenu"><h2>'.$page['evil_blog']['blog_name'].'</h2>');
                         $template->assign('TITLE_END', '</div>');
-                        $template->assign('first_page', 'index.php');
                         }else{//хлебные крошки
                         $place = 'PLUGIN_INDEX_CONTENT_END';
                         $page['title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].$page['evil_blog']['blog_name'];
                         $template->assign('TITLE_END', ' ');
-                        $template->assign('first_page', 'index.php?/blog');
                         }
                 //отсылаем в СМАРТИ настройки внешнего вида
@@ -122 +124 @@
                 //определяем адрес шаблона плагина
                 $template->set_template_dir(Evil_Blog_PATH);
-                $template->set_filename('posts', 'posts.tpl');
+                $template->set_filename('blog', 'blog.tpl');
                 //подключение стиля
                 $template->func_combine_css(array(
@@ -130 +132 @@
                 
                 //объявляем где конкретно на странице должен вывестись наш шаблон плагина. Вся суть в 'PLUGIN_INDEX_CONTENT_BEFORE'.
-                $template->concat($place,  $template->parse('posts', true));
+                $template->concat($place,  $template->parse('blog', true));
+        }
         }
 }
@@ -163 +166 @@
         
         $eb_conf = @unserialize($conf['evil_blog']);
-        if ((!$eb_conf['show_on_main_page']) and (($tokens[0]=='blog'))) {
+        if ($tokens[0]=='blog') {
                 $page['section'] = 'blog';
                 }

extensions/Evil_Blog/maintain.inc.php

@@ -19 +19 @@
                 PRIMARY KEY (id))
                 DEFAULT CHARACTER SET utf8';
-        pwg_query($query.';');
+        pwg_query($query);
+        }else{
+        $query = 
+                'SHOW FIELDS FROM"' . $prefixeTable . 'evil_blog"';
+        $result = pwg_query($query);
         }
         
@@ -62 +66 @@
                 DEFAULT CHARACTER SET utf8';
         pwg_query($query.';');
-        }
+        }/*else{
+                $result = pwg_query("SHOW FIELDS FROM " . $prefixeTable . "evil_blog;");
+                $description = false;
+                While ($row = pwg_db_fetch_assoc($result)) {
+                        if ($row['Field']=='description') {$description=true; break;}
+                }
+                if (!$description) {
+                        $result = pwg_query("ALTER TABLE " . $prefixeTable . "evil_blog CHANGE `text` `description` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;");
+                        $result = pwg_query("ALTER TABLE " . $prefixeTable . "evil_blog ADD `text` LONGTEXT NOT NULL ;");
+                }
+        }*/
         
 $config = array(
@@ -91 +105 @@
   global $prefixeTable;
   pwg_query('DROP TABLE ' . $prefixeTable . 'evil_blog;');
-  
-  $q = 'DELETE FROM ' . CONFIG_TABLE . ' WHERE '.CONFIG_TABLE.'.param="evil_blog" LIMIT 1;';
-  pwg_query($q);
+  pwg_query('DELETE FROM ' . CONFIG_TABLE . ' WHERE '.CONFIG_TABLE.'.param="evil_blog" LIMIT 1;');
   unset($conf['evil_blog']);
 }