mod_spox 0.2.0 → 0.3.0

data/data/mod_spox/extras/Karma.rb

@@ -7,18 +7,16 @@ class Karma < ModSpox::Plugin
         Datatype::Karma.create_table unless Datatype::Karma.table_exists?
         Datatype::Alias.create_table unless Datatype::Alias.table_exists?
         alias_group = Models::Group.find_or_create(:name => 'alias')
-        Models::Signature.find_or_create(:signature => 'karma (?!(fight|alias|dealias|aliases|reset) (\S+|\(.+?\)) ?(\S+|\(.+?\))?$)(\S+|\(.+?\))', :plugin => name, :method => 'score', :description => 'Returns karma for given thing').params = [:crap, :crap2, :crap3, :thing]
-        Models::Signature.find_or_create(:signature => 'karma reset (\S+|\(.+?\))', :plugin => name, :method => 'reset',
-            :group_id => Models::Group.filter(:name => 'admin').first.pk, :description => 'Reset a karma score').params = [:thing]
-        Models::Signature.find_or_create(:signature => 'karma alias (\S+|\(.+?\)) (\S+|\(.+?\))', :plugin => name, :method => 'aka',
-            :group_id => alias_group.pk, :description => 'Alias a karma object to another karma object').params = [:thing, :thang]
-        Models::Signature.find_or_create(:signature => 'karma dealias (\S+|\(.+?\)) (\S+|\(.+?\))', :plugin => name, :method => 'dealias',
-            :group_id => alias_group.pk, :description => 'Remove a karma alias').params = [:thing, :otherthing]
-        Models::Signature.find_or_create(:signature => 'karma aliases (\S+|\(.+?\))', :plugin => name, :method => 'show_aliases',
-            :description => 'Show all aliases for given thing').params = [:thing]
-        Models::Signature.find_or_create(:signature => 'karma fight (\S+|\(.+?\)) (\S+|\(.+?\))', :plugin => name, :method => 'fight',
-            :description => 'Make two karma objects fight').params = [:thing, :thang]
+        add_sig(:sig => 'karma (?!topten|bottomten$)(?!(fight|alias|dealias|aliases|reset) (\S+|\(.+?\)) ?(\S+|\(.+?\))?$)(\S+|\(.+?\))', :method => :score, :desc => 'Returns karma for given thing', :params => [:crap, :crap2, :crap3, :thing])
+        add_sig(:sig => 'karma reset (\S+|\(.+?\))', :method => :reset, :group => Models::Group.filter(:name => 'admin').first, :desc => 'Reset a karma score', :params => [:thing])
+        add_sig(:sig => 'karma alias (\S+|\(.+?\)) (\S+|\(.+?\))', :method => :aka, :group => alias_group, :desc => 'Alias a karma object to another karma object', :params => [:thing, :thang])
+        add_sig(:sig => 'karma dealias (\S+|\(.+?\)) (\S+|\(.+?\))', :method => :dealias, :group => alias_group, :desc => 'Remove a karma alias', :params => [:thing, :otherthing])
+        add_sig(:sig => 'karma aliases (\S+|\(.+?\))', :method => :show_aliases, :desc => 'Show all aliases for given thing', :params => [:thing])
+        add_sig(:sig => 'karma fight (\S+|\(.+?\)) (\S+|\(.+?\))', :method => :fight, :desc => 'Make two karma objects fight', :params => [:thing, :thang])
         add_sig(:sig => 'antikarma (\S+|\(.+?\))', :method => :antikarma, :desc => 'Show things antikarma', :params => [:thing])
+        add_sig(:sig => 'antikarma fight (\S+|\(.+?\)) (\S+|\(.+?\))', :method => :antifight, :desc => 'Make two antikarma objects fight', :params => [:thing, :thang])
+        add_sig(:sig => 'karma topten', :method => :topten, :desc => 'Show top ten highest karma objects')
+        add_sig(:sig => 'karma bottomten', :method => :bottomten, :desc => 'Show bottom ten lowest karma objects')
         @pipeline.hook(self, :check, :Incoming_Privmsg)
         @thing_maxlen = 32
         @karma_regex = /(\(.{1,#@thing_maxlen}?\)|\S{1,#@thing_maxlen})([+-]{2})(?:\s|$)/
@@ -32,10 +30,14 @@ class Karma < ModSpox::Plugin
 
     def check(message)
         if(message.is_public?)
+            @dupes = {}
             message.message.scan(@karma_regex) do |match|
                 thing, adj = match
                 thing.downcase!
                 thing = thing[1..-2] if thing[0..0] == '(' && thing[-1..-1] == ')'
+                next if @dupes.has_key?(thing) && @dupes[thing].include?(adj)
+                @dupes[thing] = [] unless @dupes[thing]
+                @dupes[thing] << adj
                 adj = adj == '++' ? +1 : -1
                 things = [thing]
                 karma = Datatype::Karma.find_or_create(:thing => thing, :channel_id => message.target.pk)
@@ -68,6 +70,32 @@ class Karma < ModSpox::Plugin
             @pipeline << Messages::Internal::TimerAdd.new(self, rand(5) + 1, nil, true){ egg(params[:thing].downcase, message) }
         end
     end
+    
+    def bottomten(m, params)
+        set = Datatype::Karma.filter(:channel_id => m.target.pk).order(:thing.asc).order(:score.asc).limit(10)
+        if(set.count > 0)
+            output = []
+            set.each do |thing|
+                output << "#{thing.thing} (#{thing.score.to_s.slice(0) == '-' ? '' : '+'}#{thing.score})"
+            end
+            reply m.replyto, "\2Karma bottom ten:\2 #{output.join(', ')}"
+        else
+            error m.replyto, 'No karma objects stored'
+        end
+    end
+    
+    def topten(m, params)
+        set = Datatype::Karma.filter(:channel_id => m.target.pk).order(:thing.asc).order(:score.desc).limit(10)
+        if(set.count > 0)
+            output = []
+            set.each do |thing|
+                output << "#{thing.thing} (#{thing.score.to_s.slice(0) == '-' ? '' : '+'}#{thing.score})"
+            end
+            reply m.replyto, "\2Karma topten:\2 #{output.join(', ')}"
+        else
+            error m.replyto, 'No karma objects stored'
+        end
+    end
 
     def antikarma(message, params)
         return unless message.is_public?
@@ -89,7 +117,7 @@ class Karma < ModSpox::Plugin
         return unless message.is_public?
         karma = Datatype::Karma.filter(:thing => sthing, :channel_id => message.target.pk).first
         if(karma)
-            karma.update_with_params(:score => 0)
+            karma.update(:score => 0)
             @pipeline << Privmsg.new(message.replyto, "Karma for \2#{karma.thing}\2 has been reset")
         else
             @pipeline << Privmsg.new(message.replyto, "\2Error:\2 #{sthing} has no karma")
@@ -108,12 +136,34 @@ class Karma < ModSpox::Plugin
         winner = thing_score > thang_score ? thing : thang
         loser = thing_score > thang_score ? thang : thing
         distance = (thing_score - thang_score).abs
-        output = "\2KARMA FIGHT RESULTS:\2 "
+        output = ["\2KARMA FIGHT RESULTS:\2 "]
         if(distance > 0)
-            reply message.replyto, "\2#{winner}\2 #{winner[-1] == 's' || winner[-1] == 115 ? 'have' : 'has'} beaten \2#{loser}\2 #{distance > 50 ? 'like a redheaded step child' : ''} (+#{distance} points)"
+            output << "\2#{winner}\2 #{winner[-1] == 's' || winner[-1] == 115 ? 'have' : 'has'} beaten \2#{loser}\2 #{distance > 50 ? 'like a redheaded step child' : ''} (+#{distance} points)"
         else
-            reply message.replyto, "\2#{winner}\2 #{winner[-1] == 's' || winner[-1] == 115 ? 'have' : 'has'} tied \2#{loser}\2"
+            output << "\2#{winner}\2 #{winner[-1] == 's' || winner[-1] == 115 ? 'have' : 'has'} tied \2#{loser}\2"
         end
+        reply message.replyto, output
+    end
+
+    def antifight(message, params)
+        thing = params[:thing]
+        thang = params[:thang]
+        thing = thing[1..-2] if thing[0..0] == '(' && thing[-1..-1] == ')'
+        thang = thang[1..-2] if thang[0..0] == '(' && thang[-1..-1] == ')'
+        rthing = Datatype::Karma.find_or_create(:thing => thing.downcase, :channel_id => message.target.pk)
+        rthang = Datatype::Karma.find_or_create(:thing => thang.downcase, :channel_id => message.target.pk)
+        thing_score = Datatype::Alias.score_object(rthing.pk) * -1
+        thang_score = Datatype::Alias.score_object(rthang.pk) * -1
+        winner = thing_score > thang_score ? thing : thang
+        loser = thing_score > thang_score ? thang : thing
+        distance = (thing_score - thang_score).abs
+        output = ["\2ANTI-KARMA FIGHT RESULTS:\2 "]
+        if(distance > 0)
+            output << "\2#{winner}\2 #{winner[-1] == 's' || winner[-1] == 115 ? 'have' : 'has'} beaten \2#{loser}\2 #{distance > 50 ? 'like a redheaded step child' : ''} (+#{distance} points)"
+        else
+            output << "\2#{winner}\2 #{winner[-1] == 's' || winner[-1] == 115 ? 'have' : 'has'} tied \2#{loser}\2"
+        end
+        reply message.replyto, output
     end
 
     def aka(message, params)
@@ -140,7 +190,7 @@ class Karma < ModSpox::Plugin
         otherthing = Datatype::Karma.filter(:thing => sotherthing, :channel_id => message.target.pk).first
         if(thing && otherthing)
             set = Datatype::Alias.filter('(thing_id = ? AND aka_id = ?) OR (thing_id = ? AND aka_id = ?)', thing.pk, otherthing.pk, otherthing.pk, thing.pk)
-            if(set.size < 1)
+            if(set.count < 1)
                 reply message.replyto, "\2Error:\2 No alias found between #{thing.thing} and #{otherthing.thing}"
             else
                 set.destroy
@@ -155,18 +205,22 @@ class Karma < ModSpox::Plugin
         thing = params[:thing].downcase
         thing = thing[1..-2] if thing[0..0] == '(' && thing[-1..-1] == ')'
         thing = Datatype::Karma.filter(:thing => thing, :channel_id => message.target.pk).first
-        if(thing)
-            things = []
-            Datatype::Alias.get_aliases(thing.pk).each do |id|
-                things << Datatype::Karma[id].thing
-            end
-            if(things.empty?)
-                reply message.replyto, "#{thing.thing} is not currently aliased"
+        begin
+            if(thing)
+                things = []
+                Datatype::Alias.get_aliases(thing.pk).each do |id|
+                    things << Datatype::Karma[id].thing
+                end
+                if(things.empty?)
+                    reply message.replyto, "#{thing.thing} is not currently aliased"
+                else
+                    reply message.replyto, "#{thing.thing} is currently aliased to: #{things.sort.join(', ')}"
+                end
             else
-                reply message.replyto, "#{thing.thing} is currently aliased to: #{things.join(', ')}"
+                reply message.replyto, "\2Error:\2 #{params[:thing]} has never been used and has no aliases"
             end
-        else
-            reply message.replyto, "\2Error:\2 #{thing.thing} has never been used and has no aliases"
+        rescue Object
+            error message.replyto, "No aliases found"
         end
     end
     
@@ -186,9 +240,7 @@ class Karma < ModSpox::Plugin
                 index [:thing, :channel_id], :unique => true
             end
 
-            def channel
-                ModSpox::Models::Channel[channel_id]
-            end
+            many_to_one :channel, :class => ModSpox::Models::Channel
         end
         class Alias < Sequel::Model
             set_schema do

data/data/mod_spox/extras/Logger.rb

@@ -22,8 +22,8 @@ class ChatLogger < ModSpox::Plugin
         @pipeline.hook(self, :log_privmsg, :Incoming_Notice)
         @pipeline.hook(self, :log_outpriv, :Outgoing_Privmsg)
         @pipeline.hook(self, :log_outpriv, :Outgoing_Notice)
-        Signature.find_or_create(:signature => 'seen (\S+)', :plugin => name, :method => 'seen', :description => 'Report last sighting of nick').params = [:nick]
-        Signature.find_or_create(:signature => 'lastspoke (\S+)', :plugin => name, :method => 'spoke', :description => 'Report last time nick spoke').params = [:nick]
+        add_sig(:sig => 'seen (\S+)', :method => :seen, :desc => 'Report last sighting of nick', :params => [:nick])
+        add_sig(:sig => 'lastspoke (\S+)', :method => :spoke, :desc => 'Report last time nick spoke', :params => [:nick])
     end
     
     def log_outpriv(message)

data/data/mod_spox/extras/LolSpeak.rb

@@ -11,8 +11,7 @@ class LolSpeak < ModSpox::Plugin
             Logger.warn('Error: This plugins requires the lolspeak gem. Please install gem and reload plugin.')
             raise BotException.new("Failed to initialize plugin. Missing lolspeak gem.")
         end
-        Signature.find_or_create(:signature => 'lolspeak (.+)', :plugin => name, :method => 'translate',
-            :description => 'Translate text to lolspeak').params = [:text]
+        add_sig(:sig => 'lolspeak (.+)', :method => :translate, :desc => 'Translate text to lolspeak', :params => [:text])
     end
     
     def translate(message, params)

data/data/mod_spox/extras/PhpCli.rb

@@ -6,7 +6,7 @@ class PhpCli < ModSpox::Plugin
 
     def initialize(pipeline)
         super(pipeline)
-        @path = Config[:plugin_directory] + '/phpcli'
+        @path = Config.val(:plugin_directory) + '/phpcli'
         @botini = @path + '/bot.ini'
         unless(File.directory?(@path))
             FileUtils.mkdir_p(@path)
@@ -18,12 +18,20 @@ class PhpCli < ModSpox::Plugin
             ini.write($ini)
             ini.close
         end
+        PhpFunction.create_table unless PhpFunction.table_exists?
         php = Group.find_or_create(:name => 'php')
+        phpfunc = Group.find_or_create(:name => 'phpfunc')
         admin = Group.filter(:name => 'admin').first
-        Signature.find_or_create(:signature => 'php (on|off)', :plugin => name, :method => 'set_channel', :group_id => admin.pk,
-            :description => 'Add or remove channel from allowing PHP command').params = [:action]
-        Signature.find_or_create(:signature => 'php (?!on|off)(.+)', :plugin => name, :method => 'execute_php', :group_id => php.pk,
-            :description => 'Execute PHP code').params = [:code]
+        add_sig(:sig => 'php (on|off)', :method => :set_channel, :group => admin, :desc => 'Add or remove channel from allowing PHP command', :params => [:action])
+        add_sig(:sig => 'php (?!on|off)(.+)', :method => :execute_php, :group => php, :desc => 'Execute PHP code', :params => [:code])
+        add_sig(:sig => 'phpq (?!on|off)(.+)', :method => :quiet_php, :group => php, :params => [:code], :desc => 'Execute PHP quietly')
+        add_sig(:sig => 'pf add (.+)', :method => :add, :params => [:function], :group => phpfunc, :desc => 'Add a custom PHP function')
+        add_sig(:sig => 'pf remove (\d+)', :method => :remove, :params => [:func_id], :group => phpfunc, :desc => 'Remove a custom PHP function')
+        add_sig(:sig => 'pf list', :method => :list, :desc => 'List custom PHP functions')
+        add_sig(:sig => 'pf edit (.+)', :method => :edit, :params => [:function], :group => phpfunc, :desc => 'Overwrite existing custom PHP function')
+        add_sig(:sig => 'pf show (\d+)', :method => :show, :params => [:func_id], :group => phpfunc, :desc => 'Show given PHP function source')
+        @customfuncs = []
+        populate_customs
         @channels = Setting.filter(:name => 'phpcli').first
         @channels = @channels.nil? ? [] : @channels.value
     end
@@ -51,11 +59,15 @@ class PhpCli < ModSpox::Plugin
         end
     end
 
-    def execute_php(message, params)
+    def quiet_php(message, params)
+        execute_php(message, params, true)
+    end
+
+    def execute_php(message, params, shh=false)
         return unless @channels.include?(message.target.pk)
         filepath = @path + "/#{rand(99999)}.bot.php"
         file = File.open(filepath, 'w')
-        file.write("<? $_SERVER = $_ENV = array(); #{params[:code]} ?>")
+        file.write("<? $_SERVER = $_ENV = $GLOBALS = array(); #{@customfuncs.join(' ')} #{params[:code]} ?>")
         file.close
         begin
             output = Helpers.safe_exec("php -c #{@path}/bot.ini -d max_execution_time=10 #{filepath} 2>&1 | head -n 4")
@@ -75,7 +87,7 @@ class PhpCli < ModSpox::Plugin
                 reply message.replyto, "PHP #{type}: "+warning
             end
             if(warning.nil? || type !~ /(Fatal|Parse)/)
-                reply message.replyto, "Result: "+output
+                reply message.replyto, "#{shh ? '' : 'Result: '}"+output
             end
             File.delete(filepath)
         rescue Timeout::Error => boom
@@ -85,9 +97,127 @@ class PhpCli < ModSpox::Plugin
             File.delete(filepath)
         end
     end
+    
+    def add(m, params)
+        if(params[:function].scan(/function\s+([^\(]+)\(/).size > 1)
+            error m.replyto, 'Only one function can be added at a time'
+            return
+        end
+        if(params[:function] =~ /^function\s+([^\(]+)\(/)
+            name = $1.downcase
+            f = PhpFunction.filter(:name => name).first
+            unless(f)
+                begin
+                    parse(params[:function])
+                    save(params[:function], name, m.source)
+                    information m.replyto, "New function \2#{name}\2 added to custom PHP functions"
+                    populate_customs
+                rescue Object => boom
+                    error m.replyto, "Failed to add function #{name}. Error: #{boom}"
+                end
+            else
+                error m.replyto, "Function with name: #{name} already exists"
+            end
+        else
+            error m.replyto, "Function is not in proper format"
+        end
+    end
+    
+    def remove(m, params)
+        f = PhpFunction[params[:func_id].to_i]
+        if(f)
+            name = f.name
+            f.destroy
+            information m.replyto, "Function \2#{name}\2 has been removed"
+            populate_customs
+        else
+            error m.replyto, "Failed to locate function with ID: #{params[:func_id]}"
+        end
+    end
+    
+    def list(m, params)
+        output = ["\2Custom PHP functions:\2"]
+        PhpFunction.all.each do |f|
+            output << "\2ID:\2 #{f.pk} \2Name:\2 #{f.name} \2Author:\2 #{f.nick.nick} \2Added:\2 #{f.added.strftime("%Y/%m/%d-%H:%M:%S")}"
+        end
+        reply m.replyto, output
+    end
+    
+    def edit(m, params)
+        if(params[:function] =~ /^function\s+([^\(]+)\(/)
+            name = $1.downcase
+            begin
+                parse(params[:function])
+                save(params[:function], name, m.source)
+                information m.replyto, "New function \2#{name}\2 added to custom PHP functions"
+                populate_customs
+            rescue Object => boom
+                error m.replyto, "Failed to add function #{name}. Error: #{boom}"
+            end
+        else
+            error m.replyto, "Function is not in proper format"
+        end
+    end
+    
+    def show(m, params)
+        f = PhpFunction[params[:func_id].to_i]
+        if(f)
+            reply m.replyto, ["Source for function \2#{f.name}\2:", f.php_function]
+        else
+            error m.replyto, "Failed to find custom PHP function with ID: #{params[:func_id]}"
+        end
+    end
+    
+    def parse(func)
+        filepath = @path + "/#{rand(99999)}.bot.php"
+        file = File.open(filepath, 'w')
+        file.write("<? #{func} ?>")
+        file.close
+        output = Helpers.safe_exec("php -l #{filepath} 2>&1 | head -n 4").strip.gsub(/\s{2,}/, ' ').gsub(/[\r\n]+/, ' ')
+        File.delete(filepath)
+        if(output =~ /(Parse error.+) in/)
+            raise "#{$1}"
+        end
+    end
+    
+    def save(func, name, nick)
+        f = PhpFunction.filter(:name => name).first
+        f = PhpFunction.new unless f
+        f.name = name
+        f.php_function = func
+        f.added = ::Time.now
+        f.nick = nick
+        f.save
+    end
+    
+    def populate_customs
+        @customfuncs = []
+        PhpFunction.all.each{|f| @customfuncs << f.php_function }
+    end
 
     class NoInterpreter < Exceptions::BotException
     end
+    
+    class PhpFunction < Sequel::Model
+        set_schema do
+            text :php_function, :null => false
+            varchar :name, :null => false, :unique => true
+            timestamp :added, :null => false
+            foreign_key :nick_id, :null => false
+            primary_key :id
+        end
+        
+        Sequel::Model.plugin :serialization, :marshal, :php_function
+#         serialize(:php_function, :format => :marshal)
+        
+        def nick
+            Models::Nick[nick_id]
+        end
+        
+        def nick=(n)
+            values[:nick_id] = n.pk
+        end
+    end
 
 end
 

data/data/mod_spox/extras/PhpFuncLookup.rb

@@ -12,8 +12,8 @@ class PhpFuncLookup < ModSpox::Plugin
     def initialize(pipeline)
         super(pipeline)
         setup_setting
-        @path = Setting[:phpfunc][:directory]
-        @trigger = Setting[:phpfunc][:trigger]
+        @path = Setting.val(:phpfunc)[:directory]
+        @trigger = Setting.val(:phpfunc)[:trigger]
         @manual = "#{@path}/html"
         @classlist = []
         fetch_manual unless File.exists?("#{@path}/manual.tar.gz")
@@ -65,15 +65,12 @@ class PhpFuncLookup < ModSpox::Plugin
             "->"    => [ "?",           "Object member accessor thingy","" ],
         }
         admin = Group.filter(:name => 'admin').first
-        Signature.find_or_create(:signature => 'pfunc (\S+)', :plugin => name, :method => 'phpfunc', :description => 'Lookup PHP function').params = [:name]
-        Signature.find_or_create(:signature => 'fetch php manual', :plugin => name, :method => 'fetch', :group_id => admin.pk,
-            :description => 'Download and extract PHP manual')
-        Signature.find_or_create(:signature => 'pfunc trigger (\S+)', :plugin => name, :method => 'set_trigger', :group_id => admin.pk,
-            :description => 'Set the trigger for auto-lookups').params = [:trigger]
-        Signature.find_or_create(:signature => 'pfunc show trigger', :plugin => name, :method => 'show_trigger', :description => 'Show current trigger')
-        Signature.find_or_create(:signature => 'pfunc (add|remove) (\S+)', :plugin => name, :method => 'set_channels', :group_id => admin.pk,
-            :description => 'Add or remove channels from auto-lookups').params = [:action, :channel]
-        Signature.find_or_create(:signature => 'pfunc show channels', :plugin => name, :method => 'list_channels', :description => 'Show channels with auto lookup enabled')
+        add_sig(:sig => 'pfunc (\S+)', :method => :phpfunc, :desc => 'Lookup PHP function', :params => [:name])
+        add_sig(:sig => 'fetch php manual', :method => :fetch, :group => admin, :desc => 'Download and extract PHP manual')
+        add_sig(:sig => 'pfunc trigger (\S+)', :method => :set_trigger, :group => admin, :desc => 'Set the trigger for auto-lookups', :params => [:trigger])
+        add_sig(:sig => 'pfunc show trigger', :method => :show_trigger, :desc => 'Show current trigger')
+        add_sig(:sig => 'pfunc (add|remove) (\S+)', :method => :set_channels, :group => admin, :desc => 'Add or remove channels from auto-lookups', :params => [:action, :channel])
+        add_sig(:sig => 'pfunc show channels', :method => :list_channels, :desc => 'Show channels with auto lookup enabled')
         @pipeline.hook(self, :listen, :Incoming_Privmsg)
         populate_classes
     end
@@ -100,7 +97,7 @@ class PhpFuncLookup < ModSpox::Plugin
     end
     
     def listen(m)
-        if(m.target.is_a?(Channel) && Setting[:phpfunc][:channels].include?(m.target.pk))
+        if(m.target.is_a?(Channel) && Setting.val(:phpfunc)[:channels].include?(m.target.pk))
             if m.message =~ /^#{Regexp.escape(@trigger)}(\S+)$/
                 phpfunc(m, {:name => $1})
             end
@@ -108,7 +105,7 @@ class PhpFuncLookup < ModSpox::Plugin
     end
     
     def set_trigger(message, params)
-        vals = Setting[:phpfunc]
+        vals = Setting.val(:phpfunc)
         vals[:trigger] = params[:trigger]
         Setting.filter(:name => 'phpfunc').first.value = vals
         @trigger = params[:trigger]
@@ -118,12 +115,12 @@ class PhpFuncLookup < ModSpox::Plugin
     def set_channels(message, params)
         channel = Channel.filter(:name => params[:channel]).first
         if(channel)
-            vals = Setting[:phpfunc]
+            vals = Setting.val(:phpfunc)
             if(params[:action] == 'add')
-                vals[:channels] << channel.pk unless Setting[:phpfunc][:channels].include?(channel.pk)
+                vals[:channels] << channel.pk unless Setting.val(:phpfunc)[:channels].include?(channel.pk)
                 reply message.replyto, "Channel \2#{params[:channel]}\2 added to PHP auto lookup"
             else
-                vals[:channels].delete(channel.pk) if Setting[:phpfunc][:channels].include?(channel.pk)
+                vals[:channels].delete(channel.pk) if Setting.val(:phpfunc)[:channels].include?(channel.pk)
                 reply message.replyto, "Channel \2#{params[:channel]}\2 has been removed from PHP auto lookup"
             end
             Setting.filter(:name => 'phpfunc').first.value = vals
@@ -133,9 +130,9 @@ class PhpFuncLookup < ModSpox::Plugin
     end
     
     def list_channels(message, params)
-        if(Setting[:phpfunc][:channels].size > 0)
+        if(Setting.val(:phpfunc)[:channels].size > 0)
             chans = []
-            Setting[:phpfunc][:channels].each do |id|
+            Setting.val(:phpfunc)[:channels].each do |id|
                 chans << Channel[id].name
             end
             reply message.replyto, "PHP auto lookup enabled channels: #{chans.join(', ')}"
@@ -145,7 +142,7 @@ class PhpFuncLookup < ModSpox::Plugin
     end
     
     def show_trigger(message, p)
-        reply message.replyto, "PHP auto lookup trigger: \2#{Setting[:phpfunc][:trigger]}\2"
+        reply message.replyto, "PHP auto lookup trigger: \2#{Setting.val(:phpfunc)[:trigger]}\2"
     end
     
     private
@@ -179,10 +176,10 @@ class PhpFuncLookup < ModSpox::Plugin
         s = Setting.filter(:name => 'phpfunc').first
         unless(s)
             s = Setting.find_or_create(:name => 'phpfunc')
-            s.value = {:directory => Config[:plugin_directory] + '/php', :trigger => '@', :channels => []}
+            s.value = {:directory => Config.val(:plugin_directory) + '/php', :trigger => '@', :channels => []}
         end
-        unless(File.directory?(Setting[:phpfunc][:directory]))
-            FileUtils.mkdir_p(Setting[:phpfunc][:directory]) 
+        unless(File.directory?(Setting.val(:phpfunc)[:directory]))
+            FileUtils.mkdir_p(Setting.val(:phpfunc)[:directory])
         end
     end
     
@@ -242,7 +239,7 @@ class PhpFuncLookup < ModSpox::Plugin
         desc = CGI::unescapeHTML(desc.gsub(/<.+?>/, ' ').gsub(/[\s]+/, ' '))
         output = [versions]
         output << "\2#{proto}\2"
-        output << desc
+        output << Helpers.convert_entities(desc)
         output << "http://www.php.net/manual/en/#{filename.gsub(/\.html$/, '.php')}"
         reply m.replyto, output
     end