Changeset 210

Timestamp:

07/04/06 18:25:59 (2 years ago)

Author:

lekeno

Message:

smarty caching (newer templates on the way)
cleanup hard coded strings
cleanup forgotten url rewriting
cleanup title management (newer templates on the way)
cleanup error pages handling
added 403 404 pages
added common_elements.php for smarty caching
bug fixes (tags in edit meme, folksonomy font size...)

Files:

• trunk/public_html/.htaccess (modified) (1 diff)
• trunk/public_html/about.php (modified) (1 diff)
• trunk/public_html/admin.php (modified) (1 diff)
• trunk/public_html/admin_categories.php (modified) (6 diffs)
• trunk/public_html/admin_category.php (modified) (3 diffs)
• trunk/public_html/ajax_click.php (modified) (1 diff)
• trunk/public_html/ajax_vote.php (modified) (2 diffs)
• trunk/public_html/akarru.lib/common.php (modified) (1 diff)
• trunk/public_html/cat_feed.php (modified) (3 diffs)
• trunk/public_html/circulation.php (modified) (2 diffs)
• trunk/public_html/comment.php (modified) (6 diffs)
• trunk/public_html/community.php (modified) (1 diff)
• trunk/public_html/config.php (modified) (1 diff)
• trunk/public_html/dynvotefeedflare.php (modified) (2 diffs)
• trunk/public_html/edit_meme.php (modified) (6 diffs)
• trunk/public_html/feed.php (modified) (2 diffs)
• trunk/public_html/help.php (modified) (1 diff)
• trunk/public_html/index.php (modified) (2 diffs)
• trunk/public_html/locale.jp (modified) (1 diff)
• trunk/public_html/login.php (modified) (3 diffs)
• trunk/public_html/logout.php (modified) (2 diffs)
• trunk/public_html/memes_by_tag.php (modified) (1 diff)
• trunk/public_html/memes_queue.php (modified) (1 diff)
• trunk/public_html/popular.php (modified) (1 diff)
• trunk/public_html/post.php (modified) (8 diffs)
• trunk/public_html/profile.php (modified) (1 diff)
• trunk/public_html/profile_edit.php (modified) (4 diffs)
• trunk/public_html/promote.php (modified) (1 diff)
• trunk/public_html/promote_queue.php (modified) (3 diffs)
• trunk/public_html/queue.php (modified) (1 diff)
• trunk/public_html/queue_feed.php (modified) (2 diffs)
• trunk/public_html/recover_pass.php (modified) (2 diffs)
• trunk/public_html/register.php (modified) (6 diffs)
• trunk/public_html/search.php (modified) (2 diffs)
• trunk/public_html/sendlink.php (modified) (2 diffs)
• trunk/public_html/sendlink_ok.php (modified) (2 diffs)
• trunk/public_html/show_cat.php (modified) (2 diffs)
• trunk/public_html/show_folksonomy.php (modified) (1 diff)
• trunk/public_html/site_circulation.php (modified) (1 diff)
• trunk/public_html/stats.php (modified) (3 diffs)
• trunk/public_html/tag_meme.php (modified) (2 diffs)
• trunk/public_html/unpopular.php (modified) (1 diff)
• trunk/public_html/vote.php (modified) (2 diffs)

trunk/public_html/.htaccess

@@ -10 +10 @@
-RewriteRule ^votes/(.*) /profile.php?user_name=$1&view=v
-RewriteRule ^comments/(.*) /profile.php?user_name=$1&view=c
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/public_html/about.php

@@ -1 +1 @@
-<?php
-  include_once('akarru.lib/common.php');
+  
+  include_once('common_elements.php');
+  
-  $smarty->assign('content_title', $bl_about);
-  $smarty->assign('content', 'about');
+  $smarty->assign('show_ads', showGGAds());
-  $smarty->display('master_page.tpl');
-?>

trunk/public_html/admin.php

@@ -3 +3 @@
-  include_once('akarru.lib/statistics.php');
-  if ($bm_user != 1) {
-
+
+
-          exit();
-          return;
-  }
+  
+  include_once('common_elements.php');
-
-'administración'
+$content_title_admin
-  $memes = new memes($bm_db, $bm_user, $bm_promo_level);
-

trunk/public_html/admin_categories.php

@@ -2 +2 @@
-  include_once('akarru.lib/common.php');
-  if ($bm_user != 1) {
-
+
+
-          exit();
-          return;
-  }
+  
+  include_once('common_elements.php');
-  
-  $categories = new categories($bm_db);
@@ -21 +24 @@
-            if ($categories->delete_category($cat_id))
-            {
+                $smarty->clear_cache(null,'db|categories');
-                header("Location: admin_categories.php");
-                exit();
@@ -45 +49 @@
-              if ($categories->edit_category($cat_id, $cat_name))
-              {
+                $smarty->clear_cache(null,'db|categories');
-                header("Location: admin_categories.php");
-                exit();
@@ -67 +72 @@
-            if ($categories->enable_category($cat_id))
-            {
+                $smarty->clear_cache(null,'db|categories');
-                header("Location: admin_categories.php");
-                exit();
@@ -82 +88 @@
-          }
-      else if (!empty($_GET['disable'])) {
-en
+dis
-          
-          $cat_id = (int) $_GET['disable'];
@@ -89 +95 @@
-            if ($categories->disable_category($cat_id))
-            {
+                $smarty->clear_cache(null,'db|categories');
-                header("Location: admin_categories.php");
-                exit();

trunk/public_html/admin_category.php

@@ -2 +2 @@
-  include_once('akarru.lib/common.php');
-  if ($bm_user != 1) {
-index
+/403
-          exit();
-          return;
@@ -17 +17 @@
-          return;
-  }
+  
+  include_once('common_elements.php');
-  
-  $categories = new categories($bm_db);
@@ -68 +70 @@
-          if ($result)
-          {
+            $smarty->clear_cache(null,'db|categories');
-            header("Location: admin_categories.php");
-            exit();

trunk/public_html/ajax_click.php

@@ -2 +2 @@
-header("Content-Type: text/xml");
-include_once('akarru.lib/common.php');
-ISO-8859-1
+UTF-8
-?>
-<root>

trunk/public_html/ajax_vote.php

@@ -2 +2 @@
-header("Content-Type: text/xml");
-include_once('akarru.lib/common.php');
-ISO-8859-1
+UTF-8
-?>
-<root>
@@ -12 +12 @@
-        if ($user_id == 1) { $bm_memes->promote($meme_id); }
-        if ($user_id == 0) {
-
+
+
+
+
+
-        }
- 
+
-                $bm_memes->vote($meme_id,$user_id);
-        }else{

trunk/public_html/akarru.lib/common.php

@@ -92 +92 @@
-  return (! in_array($ip, $noads));
-}
+
+// Error reporting functions
+function mail_error($error) {
+        // Change to your email address
+    mail('dummy@example.org', "Error on blogmemes", $error);
+}
+
+function logerror($error,$filename="errors",$send_email = 0)
+{
+    $date = date('l dS \of F Y h:i:s A');
+    $ip = "[" . $_SERVER["REMOTE_ADDR"] . "] - resolved=[" . gethostbyaddr($_SERVER["REMOTE_ADDR"]) . "]";
+    
+    $report = $error;
+    $report .= "\ndate=" . $date . "\nIP=" . $ip . " ";
+    $report = $report . "\nlooked for : " . $_SERVER["REQUEST_URI"];
+    $report = $report . "\nfrom : " . $_SERVER["HTTP_REFERER"];
+    $report = $report . "\nuser-agent : " . $_SERVER["HTTP_USER_AGENT"];
+    $report = $report . "\nquery-string : " . $_SERVER["QUERY_STRING"];
+    $report = $report . "\nhost : " . $_SERVER["HTTP_HOST"];
+    
+    $logfile = $_SERVER["DOCUMENT_ROOT"] . "/cache/logs/" . $filename;
+    $handleLog = fopen($logfile, "a");
+    if ($handleLog)
+    {
+      fwrite($handleLog, $report . "\n");
+      fclose($handleLog);  
+    }
+    
+    if ($send_email)
+    {
+        mail_error($report);
+    }
+}
-}
-

trunk/public_html/cat_feed.php

@@ -1 +1 @@
-<?php
-include_once('akarru.lib/common.php');
-
-
-
+
+
+
+
-        exit();
-        return;
@@ -11 +12 @@
-$bm_memes = new memes($bm_db, $bm_user);
-$memes = $bm_memes->get_memes_by_category($cat_id, $page, '', $page == 0? 200 : 0);
-utf
+UTF
-?>
-<rss version="2.0">
-<channel>
-= $bm_site_name ?> - <?= $bm_memes->get_category_name($cat_id)
-= $bm_url
-= $bm_lang
-= $bm_desc
+ echo($bm_site_name); ?> - <? echo($bm_memes->get_category_name($cat_id));
+ echo($bm_url);
+ echo($bm_lang);
+ echo($bm_desc);
-<copyright>(c) 2005 Eduardo Diaz Cortes</copyright>
-<generator>akarru social bookmarking engine</generator>
@@ -30 +31 @@
-foreach ($memes as $meme)
-{
+        $permalink = $bm_memes->get_permalink($meme->ID);
-        echo '<item>';
-        echo '<title>'; echo htmlspecialchars($meme->title); echo '</title>';
-        echo '<description>'; echo htmlspecialchars($meme->content); echo '</description>';
-        echo '<pubDate>'; echo date("r", $meme->date_posted); echo '</pubDate>';
-
+
+
-        echo '</item>';
-}

trunk/public_html/circulation.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
+
+
+
+
+
+
-        }
-  include_once('akarru.lib/common.php');
-
+
+
-
-
@@ -86 +88 @@
-  $smarty->assign('clicks', $clicks);
-  $smarty->assign('content', 'circulation');
+  $smarty->assign('show_ads', showGGAds());
-  $smarty->display('master_page.tpl');
-?>

trunk/public_html/comment.php

@@ -1 +1 @@
-<?php
+
+  if (isset($_GET['voted']))
+  {
+     $voted = (int) $_GET['voted'];
+  }
+  
-  $meme_id = intval($_GET['meme_id']);
-  if ($meme_id == 0) {
@@ -5 +11 @@
-  }
-  if ($meme_id == 0) {
-index
+/404
-          exit();
-          return;
-  }
-  include_once('akarru.lib/common.php');
-
+
+
+
+
-  $memes = new memes($bm_db, $bm_user);
-  if (!empty($_POST)) {
@@ -23 +32 @@
-  }
-  $memes->debate($meme_id, $bm_user, 0, true);
-
+
+
+
+
+
+
+
+
+
-  $comments = $memes->get_comments($meme_id);
-
+
+
-  $smarty->assign('meme', $meme);
-  $smarty->assign('meme_id', $meme_id);
@@ -37 +55 @@
-  foreach ($tags as $tag)
-  {
-tag/
+memes_by_tag.php?tag_name=
-  }
-  $smarty->assign('tags_of_meme', $memes_tags);
@@ -49 +67 @@
-          $neutrals = $memes->get_neutrals($meme_id);
-          $neutrals = array_diff($neutrals, $sponsors);
-anonimo" /><br /><a href="register.php">'.$meme->clicks.'&nbsp;'.$bl_anonymous.'</a>'; 
+' . $bl_anonymous . '"/><br /><a href="register.php">'.$meme->clicks.'&nbsp;'.$bl_anonymous.'</a>';
-          $smarty->assign('neutrals', $neutrals);
-  }
@@ -56 +74 @@
-          $smarty->assign('voters', $memes->get_voters($meme_id));
-  }
+  $smarty->assign('show_ads', showGGAds());
+  if (isset($_GET['voted']))
+  {
+    $smarty->assign('alreadyvoted', ($voted == 0));
+    $smarty->assign('voted', $voted);
+  }
+  else
+  {
+    $smarty->assign('alreadyvoted', false);
+    $smarty->assign('voted', false);
+  }
-  $smarty->display('master_page.tpl');
-?>

trunk/public_html/community.php

@@ -1 +1 @@
-<?php
-  include_once('akarru.lib/common.php');
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $smarty->assign('content_title', $bl_community);
-  $page_size = 120;
-  $pages = ceil($bm_users->count_users()/$page_size);
-  $smarty->assign('pages', $pages+1);
-ommunity', $bm_users->get_profile_links(0, $bm_page,$page_size)
-'community_grid'
+ached_content', TRUE
+$community_grid
-  $smarty->assign('content_feed_link', $bm_main_feeds);
-true
+showGGAds()
-  $smarty->display('master_page.tpl');
-?>

trunk/public_html/config.php

@@ -15 +15 @@
-$bm_queue_feeds = '';
-$bm_url_feeds = '';
+$bm_url_queue_feeds = '';
-$bm_lang = 'es-es';
-$bm_url  = 'http://www.blogmemes.com/';

trunk/public_html/dynvotefeedflare.php

@@ -66 +66 @@
-     $url_format = $bm_url  . "comment.php?meme_id=";
-     $startPos = strpos($_GET['url'], $url_format);
-
+
+
+
-     {
-     ?>
@@ -78 +80 @@
-     }
-     
-
-
+
+
+
+
+
+
+
+
+
+
-    if (is_numeric($meme_id))
-    {

trunk/public_html/edit_meme.php

@@ -5 +5 @@
-  }
-  if ($meme_id == 0) {
-index
+/404
-          exit();
-          return;
-  }
-  include_once('akarru.lib/common.php');
-
+
+
+
-  $memes = new memes($bm_db, $bm_user);
-
+original_
-  if ($meme->submitted_user_id != $bm_user && $bm_user != 1) {
-          header("Location: comment.php?meme_id=$meme_id");
@@ -20 +22 @@
-  if (!empty($_POST)) 
-  {
+      if ($bm_user == 1)
+      {
+        if ($_POST['disable'] == 1)
+        {
+            $memes->disable_meme($meme_id);
+        }
+        else
+        {
+            $memes->enable_meme($meme_id);
+        }
+      }
+      
-          $_POST['user_id'] = $bm_users->get_user_id();
-          $memes->update_meme($_POST);
-
+
+
-          exit();
-          return;
@@ -31 +46 @@
-  $smarty->assign('bm_cats', $bm_cats);
-
-'-- seleccione --'
+$content_title_post_seleccione
-  foreach ($bm_cats as $cat)
-  {
@@ -39 +54 @@
-
-
-
+original_
-  $comments = $memes->get_comments($meme_id);
-  $smarty->assign('meme', $meme);
@@ -47 +62 @@
-  foreach ($tags as $tag)
-  {
-
+
+
+
+
+
+
+
+
-  }
-  $smarty->assign('meme_tags', $memes_tags);
@@ -53 +75 @@
-  // end fix Kenji
-  $smarty->assign('content', 'edit_post');
+  $smarty->assign('show_ads', showGGAds());
-  $smarty->display('master_page.tpl');
-?>

trunk/public_html/feed.php

@@ -1 +1 @@
-<?php
-text/
+application/rss+
-include_once('akarru.lib/common.php');
-$bm_memes = new memes($bm_db, $bm_user);
-$memes = $bm_memes->get_memes(0, ' order by date_posted desc ', 1);
-utf
+UTF
-?>
-<rss version="2.0">
-<channel>
-= $bm_site_name
-= $bm_url
-= $bm_desc
-= $bm_lang
+ echo($bm_site_name); ?>  <? echo($bl_last_memes);
+ echo($bm_url);
+ echo($bm_desc);
+ echo($bm_lang);
-<copyright>(c) 2005 Eduardo Diaz Cortes</copyright>
-<generator>akarru social bookmarking engine</generator>
@@ -23 +23 @@
-foreach ($memes as $meme)
-{