languages as config file

This commit is contained in:
Claude 2012-04-14 19:01:11 +02:00
parent f537ecccde
commit 2513a0dc2d
3 changed files with 60 additions and 95 deletions

View File

@ -9,58 +9,88 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
//geshi languages
$config['geshi_languages'] = array(
'c' => 'C',
'html4strict' => 'HTML',
'css' => 'CSS',
'cpp' => 'C++',
'html4strict' => 'HTML (4 Strict)',
'java' => 'Java',
'perl' => 'Perl',
'javascript' => 'JavaScript',
'php' => 'PHP',
'python' => 'Python',
'ruby' => 'Ruby',
'text' => 'Plain Text',
'asm' => 'ASM (Nasm Syntax)',
'xhtml' => 'XHTML',
'bash' => 'Bash',
'c' => 'C',
'cpp' => 'C++',
'diff' => 'Diff',
'latex' => 'LaTeX',
'sql' => 'SQL',
'xml' => 'XML',
'text' => 'Plaintext',
'abap' => 'ABAP',
'actionscript' => 'Actionscript',
'ada' => 'ADA',
'apache' => 'Apache Log',
'applescript' => 'AppleScript',
'autoit' => 'AutoIT',
'bash' => 'Bash',
'bptzbasic' => 'BptzBasic',
'asm' => 'Assembler',
'asp' => 'ASP',
'autoit' => 'AutoIt',
'blitzbasic' => 'Blitzbasic',
'bnf' => 'Backus-Naur-Form',
'c_mac' => 'C for Macs',
'caddcl' => 'CAD DCL',
'cadlisp' => 'CAD Lisp',
'cfdg' => 'CFDG',
'cfm' => 'CFM',
'cpp-qt' => 'C++ QT',
'csharp' => 'C#',
'ColdFusion' => 'coldfusion',
'd' => 'D',
'delphi' => 'Delphi',
'div' => 'DIV',
'dos' => 'DOS',
'dot' => 'dot',
'eiffel' => 'Eiffel',
'fortran' => 'Fortran',
'freebasic' => 'FreeBasic',
'genero' => 'Genero',
'gml' => 'GML',
'groovy' => 'Groovy',
'inno' => 'Inno',
'haskell' => 'Haskell',
'idl' => 'Unoidl',
'ini' => 'INI',
'inno' => 'Inno Script',
'io' => 'Io',
'java' => 'Java',
'java5' => 'Java 5',
'javascript' => 'Javascript',
'latex' => 'LaTeX',
'lisp' => 'Lisp',
'lua' => 'LUA',
'm68k' => 'm68k',
'matlab' => 'Matlab',
'mirc' => 'mIRC',
'mpasm' => 'MPASM',
'mysql' => 'MySQL',
'nsis' => 'NSIS',
'objc' => 'Objective C',
'ocaml' => 'OCaml',
'oobas' => 'OpenOffice BASIC',
'orcale8' => 'Orcale 8 SQL',
'ocaml' => 'ocaml',
'oobas' => 'OpenOffice.org Basic',
'oracle8' => 'Orcale 8 SQL',
'pascal' => 'Pascal',
'per' => 'Per',
'perl' => 'Perl',
'plsql' => 'PL/SQL',
'qbasic' => 'Q(uick)BASIC',
'qbasic' => 'QBasic',
'rails' => 'Rails',
'reg' => 'Registry',
'robots' => 'robots.txt',
'sas' => 'SAS',
'scheme' => 'Scheme',
'sdlbasic' => 'SDLBasic',
'sdlbasic' => 'sdlBasic',
'smalltalk' => 'Smalltalk',
'smarty' => 'Smarty',
'sql' => 'SQL',
'tcl' => 'TCL',
'thinbasic' => 'thinBasic',
'tsql' => 'T-SQL',
'vb' => 'Visual Basic',
'vbnet' => 'VB.NET',
'vb' => 'Visual BASIC',
'winbatch' => 'Winbatch',
'xml' => 'XML',
'z80' => 'z80 ASM',
'vhdl' => 'VHDL',
'visualfoxpro' => 'Visual FoxPro',
'winbatch' => 'WinBatch',
'xpp' => 'X++',
'z80' => 'Z80',
);

View File

@ -22,28 +22,17 @@ class Languages extends CI_Model
function valid_language($lang)
{
$this->db->where('code', $lang);
$query = $this->db->get('languages');
if ($query->num_rows() > 0)
{
return true;
}
else
{
return false;
}
return array_key_exists($lang, $this->geshi_languages);
}
function get_languages()
{
$query = $this->db->get('languages');
$data = array();
foreach ($query->result_array() as $row)
foreach ($this->geshi_languages as $key => $value)
{
$data[$row['code']] = $row['description'];
$data[$key] = $value;
if ($row['code'] == 'text')
if ($key == 'text')
{
$data["0"] = "-----------------";
}
@ -53,20 +42,6 @@ class Languages extends CI_Model
function code_to_description($code)
{
$this->db->select('description');
$this->db->where('code', $code);
$query = $this->db->get('languages');
if ($query->num_rows() > 0)
{
foreach ($query->result_array() as $row)
{
return $row['description'];
}
}
else
{
return false;
}
return $this->geshi_languages[$code];
}
}

View File

@ -19,46 +19,6 @@ class Pastes extends CI_Model
function __construct()
{
parent::__construct();
if (!$this->db->table_exists('pastes'))
{
$this->db->simple_query(<<<EOT
--
-- Table structure for table `ci_sessions`
--
CREATE TABLE IF NOT EXISTS `ci_sessions` (
`session_id` varchar(40) NOT NULL default '0',
`ip_address` varchar(16) NOT NULL default '0',
`user_agent` varchar(50) NOT NULL,
`last_activity` int(10) unsigned NOT NULL default '0',
`session_data` text NOT NULL,
PRIMARY KEY (`session_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
--
-- Table structure for table `pastes`
--
CREATE TABLE IF NOT EXISTS `pastes` (
`id` int(10) NOT NULL auto_increment,
`pid` varchar(8) character set utf8 collate utf8_unicode_ci NOT NULL,
`title` varchar(32) character set utf8 collate utf8_unicode_ci NOT NULL,
`name` varchar(32) character set utf8 collate utf8_unicode_ci NOT NULL,
`lang` varchar(32) character set utf8 collate utf8_unicode_ci NOT NULL,
`private` tinyint(1) NOT NULL,
`paste` longtext character set utf8 collate utf8_unicode_ci NOT NULL,
`raw` longtext character set utf8 collate utf8_unicode_ci NOT NULL,
`created` int(10) NOT NULL,
`expire` int(10) NOT NULL default '0',
`toexpire` tinyint(1) unsigned NOT NULL,
`snipurl` varchar(64) character set utf8 collate utf8_unicode_ci NOT NULL default '0',
`replyto` varchar(8) character set utf8 collate utf8_unicode_ci NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=154 ;
EOT;
);
}
}
function countPastes()