Commit 04b1422f826f318c5fa54afa1686511b22c05882 to Lipsiasoft's blog

0

0
@@ -2,14 +2,8 @@ class RedirectController < ContentController
0
   session :off
0
 
0
   def redirect
0
-    
0
-    puts "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
0
-    
0
     # Ugly way to manage redirects, anything better ?
0
     if (request.request_uri =~ /^\/articles/)
0
-      
0
-      puts "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
0
-      
0
       redirect_to request.request_uri.gsub('/articles', ''), :status => 301
0
       return
0
     end

0

app/models/article.rb

0
@@ -275,14 +275,6 @@ class Article < Content
0
     end
0
   end
0
 
0
-  def notify_user_via_jabber(user)
0
-    if user.notify_via_jabber?
0
-      JabberNotify.send_message(user, _("New post"),
0
-                                _("A new message was posted to ") +  blog.blog_name,
0
-                                html(:body))
0
-    end
0
-  end
0
-
0
   def comments_closed?
0
     !(allow_comments? && in_feedback_window?)
0
   end

0

app/models/blog.rb

0
@@ -64,16 +64,12 @@ class Blog < CachedModel
0
   setting :theme,                      :string, 'standard_issue'
0
   setting :use_gravatar,               :boolean, false
0
   setting :global_pings_disable,       :boolean, false
0
-  setting :ping_urls,                  :string, "http://rpc.technorati.com/rpc/ping\nhttp://ping.blo.gs/\nhttp://rpc.weblogs.com/RPC2"
0
+  setting :ping_urls,                  :string, "http://blogsearch.google.com/ping/RPC2\nhttp://rpc.technorati.com/rpc/ping\nhttp://ping.blo.gs/\nhttp://rpc.weblogs.com/RPC2"
0
   setting :send_outbound_pings,        :boolean, true
0
   setting :email_from,                 :string, 'typo@example.com'
0
   setting :editor,                     :integer, 2
0
   setting :cache_option,               :string, 'caches_page'
0
 
0
-  # Jabber config
0
-  setting :jabber_address,             :string, ''
0
-  setting :jabber_password,            :string, ''
0
-
0
   #deprecation warning for plugins removal
0
   setting :deprecation_warning,        :integer, 1
0

0

app/models/comment.rb

0
@@ -17,13 +17,6 @@ class Comment < Feedback
0
     end
0
   end
0
 
0
-  def notify_user_via_jabber(user)
0
-    if user.notify_via_jabber?
0
-      JabberNotify.send_message(user, "New comment", "A new comment was posted to '#{article.title}' on #{blog.blog_name} by #{author}:
0
-        #{body}", self.html(:body))
0
-    end
0
-  end
0
-
0
   def interested_users
0
     users = User.find_boolean(:all, :notify_on_comments)
0
     self.notify_users = users

0

app/models/content.rb

0
@@ -236,7 +236,6 @@ class Content < ActiveRecord::Base
0
 
0
   def send_notification_to_user(user)
0
     notify_user_via_email(user)
0
-    notify_user_via_jabber(user)
0
   end
0
 
0
   def really_send_notifications

0

app/models/page_cache.rb

0
@@ -14,7 +14,7 @@ class PageCache
0
   def self.sweep_all
0
     logger.debug "PageCache - sweep_all called by #{caller[1].inspect}"
0
     unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
0
-      self.zap_pages(%w{index.* articles.* pages
0
+      self.zap_pages(%w{index.* articles.* pages page
0
                      pages.* feedback feedback.*
0
                      comments comments.*
0
                      categories categories.*

0

app/views/admin/settings/feedback.html.erb

0
@@ -61,15 +61,6 @@
0
               <input name="setting[email_from]" size="25" id="email_from" type="text" value="<%= this_blog.email_from %>" />
0
               <span class="float"><%= _("Email address used by Typo to send notifications")%>.</span>
0
           </li>
0
-          <li>
0
-              <label for="jabber_address" class="float"><%=_("Jabber account")%>:</label>
0
-              <input name="setting[jabber_address]" size="20" id="jabber_address" type="text" value="<%= this_blog.jabber_address %>" />
0
-              <span class="float"><%= _("Jabber account to use when sending Jabber notifications") %>.</span>
0
-          </li>
0
-          <li>
0
-              <label class="float" for="jabber_password"><%= _("Jabber password")%>:</label>
0
-              <input name="setting[jabber_password]" size="20" id="jabber_password" type="password" value="<%= this_blog.jabber_password %>" />
0
-          </li>
0
       </ul>
0
   </fieldset>
0
 <%= render :partial => 'submit' %>

0

app/views/admin/users/_form.html.erb

0
@@ -19,10 +19,6 @@
0
 <%= text_field 'user', 'email'  %> <small>(this will be shown publically if supplied)</small>
0
 </li>
0
 <li>
0
-<label class="float" for="user_jabber"><%= _("Jabber")%>:</label> 
0
-<%= text_field 'user', 'jabber'  %> <small>(this can be blank)</small>
0
-</li>
0
-<li>
0
   <label class="float" for="user_password"><%= _("Password")%>:</label>
0
   <%= password_field_tag 'user[password]', '', :id => 'user_password', :size => 30 %>
0
 </li>
0
@@ -35,12 +31,6 @@
0
   <label class="float" for="user_notify_via_email"><%= _("Send notification messages via email")%>?</label>
0
   <%= check_box 'user', 'notify_via_email'  %> 
0
 </li>
0
-
0
-<li>
0
-  <label class="float" for="user_notify_via_jabber"><%= _("Send notification messages via jabber")%>?</label>
0
-  <%= check_box 'user', 'notify_via_jabber'  %>
0
-</li>
0
-
0
 <li>
0
   <label class="float" for="user_notify_on_new_articles"><%= _("Send notification messages when new articles are posted")%>?</label>
0
   <%= check_box 'user', 'notify_on_new_articles'  %>

0

config/environment.rb

0
@@ -31,7 +31,6 @@ Rails::Initializer.run do |config|
0
     vendor/syntax/lib
0
     vendor/sparklines/lib
0
     vendor/uuidtools/lib
0
-    vendor/jabber4r/lib
0
     vendor/mocha/lib
0
     vendor/memcache-client/lib
0
     vendor/cached_model/lib

0

lang/de_DE.rb

0
@@ -403,7 +403,6 @@ Localization.define('de_DE') do |l|
0
   l.store "Jabber", "Jabber"
0
   l.store "Password Confirmation", "Passwort bestätigen"
0
   l.store "Send notification messages via email", "Benachrichtigung via Email schicken"
0
-  l.store "Send notification messages via jabber", "Benachrichtigung via Jabber schicken"
0
   l.store "Send notification messages when new articles are posted", "Benachrichtigung schicken, wenn neue Artikel veröffentlicht werden"
0
   l.store "Send notification messages when comments are posted", "Benachrichtigung schicken, wenn neue Kommentare eintreffen"
0
   
0
@@ -429,7 +428,6 @@ Localization.define('de_DE') do |l|
0
   #admin/user/show.rhtml
0
   l.store "User's articles", "Artikel des Benutzers"
0
   l.store "Notify via email", "Benachrichtigung via Email"
0
-  l.store "Notify via jabber", "Benachrichtigung via Jabber"
0
   l.store "Notify on new articles", "Benachrichtigung bei neuen Artikeln"
0
   l.store "Notify on new comments", "Benachrichtigung bei neuen Kommentaren"
0

0

lang/es_MX.rb

0
@@ -406,7 +406,6 @@ Localization.define('es_MX') do |l|
0
   l.store "Password Confirmation", "Confirmar Contrase&ntilde;a"
0
   l.store "Password confirmation", "Confirmar Contrase&ntilde;a"
0
   l.store "Send notification messages via email", "Enviar notificaciones por email"
0
-  l.store "Send notification messages via jabber", "Enviar notificaciones por Jabber"
0
   l.store "Send notification messages when new articles are posted", "Enviar notificaciones cuando un nuevo art&iacute;culo sea publicado"
0
   l.store "Send notification messages when comments are posted", "Enviar notificaciones cuando un nuevo comentario sea publicado"
0
   l.store 'this will be shown publicly if supplied', 'ser&aacute; mostrado p&uacute;blicamente si se introduce'
0
@@ -435,7 +434,6 @@ Localization.define('es_MX') do |l|
0
   #admin/user/show.rhtml
0
   l.store "User's articles", "Art&iacute;culos del usuario"
0
   l.store "Notify via email", "Notificar por email"
0
-  l.store "Notify via jabber", "Notificar por Jabber"
0
   l.store "Notify on new articles", "Notificar para nuevos art&iacute;culos"
0
   l.store "Notify on new comments", "Notificar para nuevos comentarios"
0

0

lang/fr_FR.rb

0
@@ -284,8 +284,6 @@ Localization.define('fr_FR') do |l|
0
   l.store "Source Email", "Adresse courriel source"
0
   l.store "Email address used by Typo to send notifications", "Adresse courriel utilisée par Typo pour l'envoi d'alertes"
0
   l.store "Jabber account", "Compte Jabber"
0
-  l.store "Jabber account to use when sending Jabber notifications", "Compte jabber à utiliser pour l'envoi d'alertes"
0
-  l.store "Jabber password", "Mot de passe Jabber"
0
   l.store "Spam protection", "Protection contre le spam"
0
   l.store "Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots", "La protection contre le spam permettra à typo de comparer l'adresse IP des commentateurs ainsi que le contenu de leurs commentaires avec une liste noire distante"
0
   l.store "Enable spam protection", "Activer la protection contre le spam"
0
@@ -449,7 +447,6 @@ Localization.define('fr_FR') do |l|
0
   l.store "Jabber", "Jabber"
0
   l.store "Password Confirmation", "Confirmer le mot de passe"
0
   l.store "Send notification messages via email", "Envoyer des alertes par courriel"
0
-  l.store "Send notification messages via jabber", "Envoyer des alertes par Jabber"
0
   l.store "Send notification messages when new articles are posted", "Envoyer des alertes à la publication de nouveaux billets"
0
   l.store "Send notification messages when comments are posted", "Envoyer des alertes à la publication de nouveaux commentaires"
0
   
0
@@ -475,7 +472,6 @@ Localization.define('fr_FR') do |l|
0
   #admin/user/show.rhtml
0
   l.store "User's articles", "Articles publiés par cet utilisateur"
0
   l.store "Notify via email", "Cet utilisateur reçoit des alertes par courriel"
0
-  l.store "Notify via jabber", "Cet utilisateur reçoit des alertes par Jabber"
0
   l.store "Notify on new articles", "Cet utilisateur est alerté à la publication d'un nouveau billet"
0
   l.store "Notify on new comments", "Cet utilisateur est alerté à la publication d'un nouveau commentaire"
0

0

lang/it_IT.rb

0
@@ -293,8 +293,6 @@ Localization.define('it_IT') do |l|
0
   l.store "Source Email", "Indirizzo mittente mail"
0
   l.store "Email address used by Typo to send notifications", "Indirizzo email usato dal blog per inviare le notifiche"
0
   l.store "Jabber account", "Account Jabber"
0
-  l.store "Jabber account to use when sending Jabber notifications", "Jabber account da usare per inviare le notifiche"
0
-  l.store "Jabber password", "Password di jabber"
0
   l.store "Spam protection", "Protezione contro lo spam"
0
   l.store "Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots", "Abilitando la protezione contro lo spam fa si che il blog compari gli IP di chi invia i commenti e anche il loro contenuto con una blacklist remota. E' una buona difesa contro gli spam robot"
0
   l.store "Enable spam protection", "Abilita la protezione spam"
0
@@ -452,7 +450,6 @@ Localization.define('it_IT') do |l|
0
   l.store "Jabber", "Jabber"
0
   l.store "Password Confirmation", "Conferma password"
0
   l.store "Send notification messages via email", "Invia notifiche via mail"
0
-  l.store "Send notification messages via jabber", "Invia notifiche via jabber"
0
   l.store "Send notification messages when new articles are posted", "Invia notifiche quando viene pubblicato un nuovo articolo"
0
   l.store "Send notification messages when comments are posted", "Invia notifiche quando viene inserito un nuovo commento"
0
   
0
@@ -478,7 +475,6 @@ Localization.define('it_IT') do |l|
0
   #admin/user/show.rhtml
0
   l.store "User's articles", "Articoli dell'utente"
0
   l.store "Notify via email", "Notifiche via mail"
0
-  l.store "Notify via jabber", "Notifiche via Jabber"
0
   l.store "Notify on new articles", "Notifiche di nuovi articoli"
0
   l.store "Notify on new comments", "Notifiche di nuovi commenti"
0

0

lang/ja_JP.rb

0
@@ -438,7 +438,6 @@ Localization.define('ja_JP') do |l|
0
   l.store "Jabber", "Jabber"
0
   l.store "Password Confirmation", "パスワード確認"
0
   l.store "Send notification messages via email", "email経由で通知を送信"
0
-  l.store "Send notification messages via jabber", "jabber経由で通知を送信"
0
   l.store "Send notification messages when new articles are posted", "新しい記事が投稿された際に通知メッセージを送る"
0
   l.store "Send notification messages when comments are posted", "コメントが投稿された際に通知メッセージを送る"
0
 
0
@@ -464,7 +463,6 @@ Localization.define('ja_JP') do |l|
0
   #admin/user/show.rhtml
0
   l.store "User's articles", "ユーザーの記事"
0
   l.store "Notify via email", "email経由で通知"
0
-  l.store "Notify via jabber", "jabber経由で通知"
0
   l.store "Notify on new articles", "新しい記事を通知"
0
   l.store "Notify on new comments", "新しいコメントを通知"
0

0

lang/pl_PL.rb

0
@@ -438,7 +438,6 @@ Localization.define('pl_PL') do |l|
0
   l.store "Jabber", "Jabber"
0
   l.store "Password Confirmation", "Potwierdzenie hasła"
0
   l.store "Send notification messages via email", "Wysyłaj powiadomienia emailem"
0
-  l.store "Send notification messages via jabber", "Wysyłaj powiadomienia Jabberem"
0
   l.store "Send notification messages when new articles are posted", "Wysyłaj powiadomienia o nowych artykułach"
0
   l.store "Send notification messages when comments are posted", "Wysyłaj powiadomienia o nowych komentarzach"
0
   
0
@@ -464,7 +463,6 @@ Localization.define('pl_PL') do |l|
0
   #admin/user/show.rhtml
0
   l.store "User's articles", "Artykuły użytkownika"
0
   l.store "Notify via email", "Powiadamiaj emailem"
0
-  l.store "Notify via jabber", "Powiadamiaj Jabberem"
0
   l.store "Notify on new articles", "Powiadamiaj o nowych artykułach"
0
   l.store "Notify on new comments", "Powiadamiaj o nowych komentarzach"
0

0

lang/ro_RO.rb

0
@@ -403,7 +403,6 @@ Localization.define('ro_RO') do |l|
0
   l.store "Password Confirmation", "Confirmă parola"
0
   l.store "Password confirmation", "Confirmă parola"
0
   l.store "Send notification messages via email", "Alerte prin email"
0
-  l.store "Send notification messages via jabber", "Alerte prin Jabber"
0
   l.store "Send notification messages when new articles are posted", "Alerte la publicarea de articole noi"
0
   l.store "Send notification messages when comments are posted", "Alerte la publicarea de comentarii noi"
0
   l.store 'this will be shown publicly if supplied', 'va fi vizibilă public'
0
@@ -432,7 +431,6 @@ Localization.define('ro_RO') do |l|
0
   #admin/user/show.rhtml
0
   l.store "User's articles", "Articole publicate de acest utilizator"
0
   l.store "Notify via email", "Primește alerte prin email"
0
-  l.store "Notify via jabber", "Primește alerte prin Jabber"
0
   l.store "Notify on new articles", "Primește alerte la publicarea de articole noi"
0
   l.store "Notify on new comments", "Primește alerte la publicarea de comentarii noi"
0

0

lib/tasks/release.rake

0
@@ -35,7 +35,6 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency("mongrel_cluster", ">= 0.2.0")
0
   s.add_dependency("sqlite3-ruby", ">= 1.1.0")
0
   s.add_dependency("rails-app-installer", ">= 0.2.0")
0
-  s.add_dependency("xmpp4r", ">= 0.3.1")
0
 end
0
 
0
 Rake::GemPackageTask.new(spec) do |p|

0

spec/models/configuration_spec.rb

0
@@ -98,11 +98,6 @@ describe 'Given a new blog' do
0
     @blog.email_from.should == 'typo@example.com'
0
   end
0
 
0
-  it 'Jabber address and password should be blank' do
0
-    @blog.jabber_address.should be_blank
0
-    @blog.jabber_password.should be_blank
0
-  end
0
-
0
   it '#is_okay should be false until #blog_name is explicitly set' do
0
     @blog.should_not be_configured
0
     @blog.blog_name = 'Specific blog name'

0

test/fixtures/blogs.yml

0
@@ -2,7 +2,6 @@
0
 default:
0
   base_url: http://myblog.net
0
   settings:
0
-    jabber_password: ""
0
     show_extended_on_rss: true
0
     itunes_owner: ""
0
     blog_name: test blog
0
@@ -24,7 +23,6 @@ default:
0
     send_outbound_pings: false
0
     itunes_copyright: ""
0
     sp_global: true
0
-    jabber_address: ""
0
     default_allow_comments: true
0
     itunes_subtitle: ""
0
     email_from: scott@sigkill.org

0

test/fixtures/users.yml

0
@@ -6,7 +6,6 @@ tobi:
0
   name: Tobi
0
   email: tobi@example.com
0
   notify_via_email: true
0
-  notify_via_jabber: false
0
   notify_on_new_articles: false
0
   notify_on_comments: true
0
   profile: admin
0
@@ -17,7 +16,6 @@ bob:
0
   name: Bob
0
   email: bob@example.com
0
   notify_via_email: false
0
-  notify_via_jabber: false
0
   notify_on_new_articles: true
0
   notify_on_comments: false
0
   profile: admin
0
@@ -28,7 +26,6 @@ existingbob:
0
   name: Also Bob
0
   email: alsobob@example.com
0
   notify_via_email: true
0
-  notify_via_jabber: false
0
   notify_on_new_articles: false
0
   notify_on_comments: false
0
   profile: admin
0
@@ -39,7 +36,6 @@ longbob:
0
   name: More Bob
0
   email: longbob@example.com
0
   notify_via_email: false
0
-  notify_via_jabber: false
0
   notify_on_new_articles: false
0
   notify_on_comments: false
0
   profile: admin
0
@@ -50,7 +46,6 @@ randomuser:
0
   name: Random User
0
   email: randomuser@example.com
0
   notify_via_email: true
0
-  notify_via_jabber: false
0
   notify_on_new_articles: true
0
   notify_on_comments: true
0
   profile: admin

Fork of typo/blog
Description:	The typo blogging engine for enteprise
Homepage:	http://www.lipsiasoft.com
Clone URL:	git://github.com/Lipsiasoft/blog.git Give this clone URL to anyone. `git clone git://github.com/Lipsiasoft/blog.git`

Comments