From 297a6da1436ebca90e9ae08778e7c22070358ffe Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Thu, 22 Oct 2009 04:19:29 +0000 Subject: [PATCH] minor code cleanup --- e107_admin/emoticon.php | 10 +++++----- e107_handlers/form_handler.php | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index 3c9f5f81e..c4579f7b0 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -9,8 +9,8 @@ * Administration Area - Emotions Settings & Packs * * $Source: /cvs_backup/e107_0.8/e107_admin/emoticon.php,v $ - * $Revision: 1.17 $ - * $Date: 2009-09-01 20:09:35 $ + * $Revision: 1.18 $ + * $Date: 2009-10-22 04:19:29 $ * $Author: e107coders $ * */ @@ -32,9 +32,9 @@ $emessage = &eMessage::getInstance(); if(!$sql->db_Count("core", "(*)", "WHERE e107_name = 'emote_default' AND e107_value !='' ")) { // Set up the default emotes - $tmp = 'a:28:{s:9:"alien!png";s:6:"!alien";s:10:"amazed!png";s:7:"!amazed";s:9:"angry!png";s:11:"!grr !angry";s:12:"biglaugh!png";s:4:"!lol";s:11:"cheesey!png";s:10:":D :oD :-D";s:12:"confused!png";s:10:":? :o? :-?";s:7:"cry!png";s:19:"&| &-| &o| :(( !cry";s:8:"dead!png";s:21:"x) xo) x-) x( xo( x-(";s:9:"dodge!png";s:6:"!dodge";s:9:"frown!png";s:10:":( :o( :-(";s:7:"gah!png";s:10:":@ :o@ :o@";s:8:"grin!png";s:10:":D :oD :-D";s:9:"heart!png";s:6:"!heart";s:8:"idea!png";s:10:":! :o! :-!";s:7:"ill!png";s:4:"!ill";s:7:"mad!png";s:13:"~:( ~:o( ~:-(";s:12:"mistrust!png";s:9:"!mistrust";s:11:"neutral!png";s:10:":| :o| :-|";s:12:"question!png";s:2:"?!";s:12:"rolleyes!png";s:10:"B) Bo) B-)";s:7:"sad!png";s:4:"!sad";s:10:"shades!png";s:10:"8) 8o) 8-)";s:7:"shy!png";s:4:"!shy";s:9:"smile!png";s:10:":) :o) :-)";s:11:"special!png";s:3:"%-6";s:12:"suprised!png";s:10:":O :oO :-O";s:10:"tongue!png";s:21:":p :op :-p :P :oP :-P";s:8:"wink!png";s:10:";) ;o) ;-)";}'; - $insert = array("e107_name"=>"emote_default", "e107_value"=>$tmp); - $sql->db_Replace("core", $insert); +// $tmp = 'a:28:{s:9:"alien!png";s:6:"!alien";s:10:"amazed!png";s:7:"!amazed";s:9:"angry!png";s:11:"!grr !angry";s:12:"biglaugh!png";s:4:"!lol";s:11:"cheesey!png";s:10:":D :oD :-D";s:12:"confused!png";s:10:":? :o? :-?";s:7:"cry!png";s:19:"&| &-| &o| :(( !cry";s:8:"dead!png";s:21:"x) xo) x-) x( xo( x-(";s:9:"dodge!png";s:6:"!dodge";s:9:"frown!png";s:10:":( :o( :-(";s:7:"gah!png";s:10:":@ :o@ :o@";s:8:"grin!png";s:10:":D :oD :-D";s:9:"heart!png";s:6:"!heart";s:8:"idea!png";s:10:":! :o! :-!";s:7:"ill!png";s:4:"!ill";s:7:"mad!png";s:13:"~:( ~:o( ~:-(";s:12:"mistrust!png";s:9:"!mistrust";s:11:"neutral!png";s:10:":| :o| :-|";s:12:"question!png";s:2:"?!";s:12:"rolleyes!png";s:10:"B) Bo) B-)";s:7:"sad!png";s:4:"!sad";s:10:"shades!png";s:10:"8) 8o) 8-)";s:7:"shy!png";s:4:"!shy";s:9:"smile!png";s:10:":) :o) :-)";s:11:"special!png";s:3:"%-6";s:12:"suprised!png";s:10:":O :oO :-O";s:10:"tongue!png";s:21:":p :op :-p :P :oP :-P";s:8:"wink!png";s:10:";) ;o) ;-)";}'; +// $insert = array("e107_name"=>"emote_default", "e107_value"=>$tmp); +// $sql->db_Replace("core", $insert); } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 74f9e1497..a43bbcd5e 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -9,8 +9,8 @@ * Form Handler * * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ - * $Revision: 1.50 $ - * $Date: 2009-10-20 16:18:07 $ + * $Revision: 1.51 $ + * $Date: 2009-10-22 04:19:29 $ * $Author: e107coders $ * */ @@ -73,9 +73,9 @@ class e_form function e_form($enable_tabindex = false) { + $this->_tabindex_enabled = $enable_tabindex; - $e107 = &e107::getInstance(); - $this->_uc = &$e107->user_class; + $this->_uc = e107::getUserClass(); } function text($name, $value, $maxlength = 200, $options = array())