Commits

Ahmed Youssef committed 4fc1195

installer/deadlock fixes

Comments (0)

Files changed (526)

application/3rdparty/DifferenceEngine.php

File contents unchanged.

application/3rdparty/Text/Diff.php

File contents unchanged.

application/3rdparty/Text/Diff/Engine/native.php

File contents unchanged.

application/3rdparty/Text/Diff/Engine/shell.php

File contents unchanged.

application/3rdparty/Text/Diff/Engine/string.php

File contents unchanged.

application/3rdparty/Text/Diff/Engine/xdiff.php

File contents unchanged.

application/3rdparty/Text/Diff/Renderer.php

File contents unchanged.

application/3rdparty/Text/Diff/Renderer/inline.php

File contents unchanged.

application/3rdparty/Wiki.php

 /**
  * The baseline abstract parser class.
  */
-require_once 'Text/Wiki/Parse.php';
+require_once 'Wiki/Parse.php';
 
 /**
  * The baseline abstract render class.
  */
-require_once 'Text/Wiki/Render.php';
+require_once 'Wiki/Render.php';
 
 /**
  * Parse structured wiki text and render into arbitrary formats such as XHTML.

application/3rdparty/Wiki/Default.php

File contents unchanged.

application/3rdparty/Wiki/Parse.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Anchor.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Blockquote.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Bold.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Break.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Center.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Code.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Colortext.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Deflist.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Delimiter.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Embed.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Emphasis.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Freelink.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Function.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Heading.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Horiz.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Html.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Image.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Include.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Interwiki.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Italic.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/List.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Newline.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Paragraph.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Phplookup.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Prefilter.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Raw.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Revise.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Smiley.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Strong.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Subscript.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Superscript.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Table.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Tighten.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Toc.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Tt.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Underline.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Url.php

File contents unchanged.

application/3rdparty/Wiki/Parse/Default/Wikilink.php

File contents unchanged.

application/3rdparty/Wiki/Render.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Anchor.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Blockquote.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Bold.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Box.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Break.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Center.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Code.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Colortext.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Deflist.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Delimiter.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Embed.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Emphasis.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Font.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Freelink.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Function.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Heading.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Horiz.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Html.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Image.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Include.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Interwiki.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Italic.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/List.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Newline.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Page.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Paragraph.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Phplookup.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Plugin.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Prefilter.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Preformatted.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Raw.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Revise.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Smiley.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Specialchar.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Strong.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Subscript.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Superscript.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Table.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Tighten.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Titlebar.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Toc.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Tt.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Underline.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Url.php

File contents unchanged.

application/3rdparty/Wiki/Render/Latex/Wikilink.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Anchor.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Blockquote.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Bold.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Box.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Break.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Center.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Code.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Colortext.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Deflist.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Delimiter.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Embed.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Emphasis.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Font.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Freelink.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Function.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Heading.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Horiz.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Html.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Image.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Include.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Interwiki.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Italic.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/List.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Newline.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Page.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Paragraph.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Phplookup.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Plugin.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Prefilter.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Preformatted.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Raw.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Revise.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Smiley.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Specialchar.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Strong.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Subscript.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Superscript.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Table.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Tighten.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Titlebar.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Toc.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Tt.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Underline.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Url.php

File contents unchanged.

application/3rdparty/Wiki/Render/Plain/Wikilink.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Address.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Anchor.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Blockquote.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Bold.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Box.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Break.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Center.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Code.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Colortext.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Deflist.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Delimiter.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Embed.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Emphasis.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Font.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Freelink.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Function.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Heading.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Horiz.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Html.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Image.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Include.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Interwiki.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Italic.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/List.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Newline.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Page.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Paragraph.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Phplookup.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Plugin.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Prefilter.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Preformatted.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Raw.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Revise.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Smiley.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Specialchar.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Strong.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Subscript.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Superscript.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Table.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Tighten.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Titlebar.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Toc.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Tt.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Underline.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Url.php

File contents unchanged.

application/3rdparty/Wiki/Render/Xhtml/Wikilink.php

File contents unchanged.

application/README

File contents unchanged.

application/config/template.php

File contents unchanged.

application/core/MY_Config.php

File contents unchanged.

application/core/MY_Controller.php

File contents unchanged.

application/core/MY_Lang.php

File contents unchanged.

application/core/MY_Loader.php

File contents unchanged.

application/core/MY_Router.php

File contents unchanged.

application/hooks/pear_hook.php

File contents unchanged.

application/ion_auth.mssql.sql

File contents unchanged.

application/ion_auth.postgre.sql

File contents unchanged.

application/ion_auth.sql

File contents unchanged.

application/language/arabic/ion_auth_lang.php

File contents unchanged.

application/language/catalan/ion_auth_lang.php

File contents unchanged.

application/language/dutch/ion_auth_lang.php

File contents unchanged.

application/language/estonian/ion_auth_lang.php

File contents unchanged.

application/language/french/ion_auth_lang.php

File contents unchanged.

application/language/german/ion_auth_lang.php

File contents unchanged.

application/language/greek/ion_auth_lang.php

File contents unchanged.

application/language/japanese/ion_auth_lang.php

File contents unchanged.

application/language/pirate/ion_auth_lang.php

File contents unchanged.

application/language/polish/ion_auth_lang.php

File contents unchanged.

application/language/portuguese/ion_auth_lang.php

File contents unchanged.

application/language/russian/ion_auth_lang.php

File contents unchanged.

application/language/spanish/ion_auth_lang.php

File contents unchanged.

application/language/swedish/ion_auth_lang.php

File contents unchanged.

application/language/turkish/ion_auth_lang.php

File contents unchanged.

application/language/ukrainian/ion_auth_lang.php

File contents unchanged.

application/language/zh_tw/ion_auth_lang.php

File contents unchanged.

application/libraries/Ion_auth.php

File contents unchanged.

application/libraries/Pearloader.php

File contents unchanged.

application/libraries/Template.php

File contents unchanged.

application/libraries/new file

File contents unchanged.

application/models/attachments_model.php

File contents unchanged.

application/models/cikimeta_model.php

     }
     function getMetaValue($domain, $key){
         $m=$this->getMeta($domain, $key);
-        return $m->value;
+        if ($m){
+			return $m->value;
+		}
+		return FAlSE;
     }
     function updateMeta($id, $data){
         $this->db->where("id", $id);

application/modules/admin/controllers/admin.php

File contents unchanged.

application/modules/admin/views/adminv/adminnav.php

File contents unchanged.

application/modules/admin/views/adminv/admmain.php

File contents unchanged.

application/modules/admin/views/adminv/settings.php

File contents unchanged.

application/modules/auth/config/ion_auth.php

File contents unchanged.

application/modules/auth/controllers/admin.php

 		{ //check to see if we are creating the user
 			//redirect them back to the admin page
 			$this->session->set_flashdata('message', "User Created");
-			redirect("auth/admin/users", 'refresh');
+			redirect("admin/users", 'refresh');
 		}
 		else
 		{ //display the create user form

application/modules/auth/controllers/auth.php

File contents unchanged.

application/modules/auth/language/english/ion_auth_lang.php

File contents unchanged.

application/modules/auth/libraries/Ion_auth.php

File contents unchanged.

application/modules/auth/models/ion_auth_model.php

File contents unchanged.

application/modules/auth/views/authv/change_password.php

File contents unchanged.

application/modules/auth/views/authv/create_user.php

File contents unchanged.

application/modules/auth/views/authv/create_user_adm.php

 	
 	<div id="infoMessage"><?php echo $message;?></div>
 	
-    <?php echo form_open("auth/admin/new_user");?>
+    <?php echo form_open("admin/modules/new_user");?>
       <p>First Name:<br />
       <?php echo form_input($first_name);?>
       </p>

application/modules/auth/views/authv/deactivate_user.php

File contents unchanged.

application/modules/auth/views/authv/edit_user.php

File contents unchanged.

application/modules/auth/views/authv/email/activate.tpl.php

File contents unchanged.

application/modules/auth/views/authv/email/forgot_password.tpl.php

File contents unchanged.

application/modules/auth/views/authv/email/new_password.tpl.php

File contents unchanged.

application/modules/auth/views/authv/forgot_password.php

File contents unchanged.

application/modules/auth/views/authv/index.php

File contents unchanged.

application/modules/auth/views/authv/login.php

File contents unchanged.

application/modules/auth/views/authv/testview.php

File contents unchanged.

application/modules/auth/views/authv/users.php

             <?php endforeach;?>
             </tbody>
         </table>
+        <span><?php echo anchor("admin/module/auth/new_user", "Create new user");?></span>
 </div>
 

application/modules/db/controllers/admin.php

File contents unchanged.

application/modules/db/views/admin/backup.php

File contents unchanged.

application/modules/db/views/admin/dbops.php

File contents unchanged.

application/modules/db/views/admin/phpstatus.php

File contents unchanged.

application/modules/db/views/admin/sqlman.php

File contents unchanged.

application/modules/installer/INSTALL

File contents unchanged.

application/modules/installer/cikidb.sql

--- phpMyAdmin SQL Dump
--- version 3.3.3
--- http://www.phpmyadmin.net
---
--- Host: localhost
--- Generation Time: Jul 22, 2010 at 01:51 PM
--- Server version: 5.1.47
--- PHP Version: 5.3.2
 
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
---
--- Database: `cikidb`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `cikimeta`
---
 
 CREATE TABLE IF NOT EXISTS `cikimeta` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=12 ;
 
---
--- Dumping data for table `cikimeta`
---
+
 
 INSERT INTO `cikimeta` (`id`, `domain`, `key`, `value`) VALUES
 (1, 'site', 'site_title', 'Cikiwiki'),
 (9, 'wiki', 'max_files_per_post', 1),
 (10,'wiki', 'max_attachment_size', 1024);
 
--- --------------------------------------------------------
 
---
--- Table structure for table `groups`
---
 
 CREATE TABLE IF NOT EXISTS `groups` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
 
---
--- Dumping data for table `groups`
---
 
 INSERT INTO `groups` (`id`, `name`, `description`, `permissions`) VALUES
 (1, 'admin', 'Administrator', 4),
 (2, 'members', 'General User', 5);
 
--- --------------------------------------------------------
-
---
--- Table structure for table `meta`
---
 
 CREATE TABLE IF NOT EXISTS `meta` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
 
---
--- Dumping data for table `meta`
---
 
 INSERT INTO `meta` (`id`, `user_id`, `first_name`, `last_name`, `company`, `phone`) VALUES
 (1, 1, 'Admin', 'istrator', 'ADMIN', '0');
 
--- --------------------------------------------------------
-
---
--- Table structure for table `pages`
---
 
 CREATE TABLE IF NOT EXISTS `pages` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
 
---
--- Dumping data for table `pages`
---
 
 INSERT INTO `pages` (`id`, `pagepath`, `pagetitle`, `pagecontent`, `author_id`) VALUES
 (1, 'wiki:index', 'index', '[[toc]]\n\n\n+++ markItUp! Universal markup editor\n\n[http://markitup.jaysalvat.com/examples/markitup/preview/picture.png markItUp! Logo]\n\n''''''markItUp!'''''' is a javascript over [http://www.jquery.com jQuery] plug-in which allow you to turn any textarea in a markup editor. \n\n''''''markItUp!'''''' is a lightweight fully customizable engine made to easily fit all developers needs in their CMS, blogs, forums or websites.\n\n''''Html, Textile, Wiki Syntax, Markdown, BBcode'''' or even your own Markup system can be easily implemented.\n\n* integrate it easily\n* customize buttons and macros to fit all your need\n* customize keyboard shortcuts\n* customize toolbar and css look and feel\n** skins\n** icons\n** dropdown menus\n** separators\n* use the engine from anywhere in the page\n* implement any markup language even your own\n* implement your own javascript macros even the most advanced\n* allow multi-line edition\n* preview ajax result dynamically in any markup parser\n* offers userfriendly experience and effectiveness', 0),
 (2, 'wiki:home', 'Home', 'da our homeeeee!', 1),
 (3, 'projects:home', 'home2', 'da el home lel projects', 1);
 
--- --------------------------------------------------------
 
---
--- Table structure for table `users`
---
 
 CREATE TABLE IF NOT EXISTS `users` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
 
-/*
---
--- Dumping data for table `users`
---
 
-INSERT INTO `users` (`id`, `group_id`, `ip_address`, `username`, `password`, `salt`, `email`, `activation_code`, `forgotten_password_code`, `remember_code`, `created_on`, `last_login`, `active`) VALUES
-(1, 1, '127.0.0.1', 'administrator', '59beecdf7fc966e2f17fd8f65a4a9aeb09d4a3d4', '9462e8eee0', 'admin@admin.com', '', NULL, '9d029802e28cd9c768e8e62277c0df49ec65c48c', 1268889823, 1279733882, 1);
-
-*/
 CREATE TABLE IF NOT EXISTS `attach` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `location` varchar(255) COLLATE utf8_bin DEFAULT NULL,

application/modules/installer/controllers/installer.php

     
     function __construct(){
         parent::__construct();
+        $this->load->database();
         $this->load->dbutil();
         //$this->load->library("template");
         $p=APPPATH."themes/";
     }
     
     function index(){
-        redirect('installer/install');
+        redirect('installer/create_dbtables');
     }
-
+	function create_dbtables(){
+		$sqlfilepath=(dirname(__DIR__)).DIRECTORY_SEPARATOR."cikidb.sql";
+		echo $sqlfilepath;
+		$contents=file_get_contents($sqlfilepath);
+		//echo $contents;
+		$this->sql_query_file($contents);	
+		redirect("installer/install");
+	}
     function install_complete(){
         $this->load->model("cikimeta_model", "meta_m");
         $home=$this->meta_m->getMetaValue("wiki", "wiki_mainpage");
 			$email = $this->input->post('email');
 			$password = $this->input->post('password');
 
-			$additional_data = array('first_name' => $this->input->post('first_name'),
+			$additional_data = array(/*'first_name' => $this->input->post('first_name'),
 				'last_name' => $this->input->post('last_name'),
 				'company' => $this->input->post('company'),
                 'group_id'=>1,
 				'phone' => $this->input->post('phone1') . '-' . $this->input->post('phone2') . '-' . $this->input->post('phone3'),
-			);
+			*/);
+
 		}
 		if ($this->form_validation->run() == true && $this->ion_auth_m->register($username, $password, $email, $additional_data))
 		{ //check to see if we are creating the user
 			//redirect them back to the admin page
-			$this->session->set_flashdata('message', "User Created");
+
+
+			
 			redirect("installer/install_complete", 'refresh');
 		}
 		else
 			$this->template->build("installview", $data);
 		}     
     }
+    
+    function sql_query_file($database_schema){
+		
+		//var_dump($database_schema);
+		if($database_schema){
+			$query="";
+			
+					
+			foreach (explode("\n", $database_schema) as $line)
+			{
+				
+				if (substr($line, 0, 1) != '#' && $line != '') 
+				{
+					$query .= $line;
+					if (substr(trim($line), -1, 1) == ';') 
+					{
+						//echo "<br /><br /><br />QUERY: ".$query."<br /><br /><br />";
+						$this->db->simple_query($query);
+						$query = '';
+					}
+				}
+			}
+				
+		}
+
+			
+	}    
 }
 
 

application/modules/installer/views/footer.php

File contents unchanged.

application/modules/installer/views/header.php

File contents unchanged.

application/modules/installer/views/installdone.php

File contents unchanged.

application/modules/installer/views/installview.php

File contents unchanged.

application/modules/main/controllers/main.php

 
     }   
     function index() {
-        $mainpage = $this->Cikimeta_model->getMetaValue("wiki", "wiki_mainpage");
+        $mainpage = $this->Cikimeta_model->getMetaValue("site", "wiki_mainpage");
         //$page=$this->Pages_model->pageByPath($mainpage);
         redirect("main/page/$mainpage");
     }
         if ($this->current_user_can("c")) {
             $this->loadpage("page/add_page", $this->_getBasicData());
         } else {
-            $this->_info("Not alloed to create new pages.");
+            $this->_info("Not allowed to create new pages.");
         }
     }
 

application/modules/main/models/pages_model.php

File contents unchanged.

application/modules/main/views/page/add_page.php

File contents unchanged.

application/modules/main/views/page/edit_page.php

File contents unchanged.