Skip to content

Bugfix #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arnakke wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bugfix #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d17da0
Removed call to non-existing function mac2ibm.
arnakke Apr 30, 2014
795f6f8
Fixed broken SQL query.
arnakke Jan 28, 2014
8afaa96
Changed require global_config.php to require_once in 4 files to stop …
arnakke Feb 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CodeIgniter_2.0.2/application/config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
define('FF_MEMBERSHIP', 48);
define('FF_FRUITBAG', 51);

require('global_config.php');
require_once('global_config.php');


/*
Expand Down
2 changes: 1 addition & 1 deletion CodeIgniter_2.0.2/application/models/memberinfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ function get_members($division = 0)
{
$this->db->select('uid, CONCAT(`firstname`, " ", `middlename`, " ", `lastname`) AS `name`,');
$this->db->select('email, tel, UNIX_TIMESTAMP(last_login) AS last_login,');
$this->db->select('UNIX_TIMESTAMP(`created`) AS `created`', FALSE);
$this->db->select('UNIX_TIMESTAMP(`ff_persons`.`created`) AS `created`', FALSE);
$this->db->select('membernote.note');
$this->db->from('persons, division_members');
$this->db->join('membernote', 'membernote.puid = ff_persons.uid', 'left');
Expand Down
2 changes: 1 addition & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
require('global_config.php');
require_once('global_config.php');

/*
*---------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions ressources/.library.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ function createperson($email, $password, $firstname, $middlename, $lastname, $se
$fields = "firstname, middlename, lastname, sex, adr1, adr2, streetno, floor, adr3, zip, city, country, languagepref, tel, mobil, email, birthday, club, password, status1, status2, status3, rights, privacy, ownupdate, created, changed, uid";
$values = "'$firstname', '$middlename', '$lastname', '$sex', '$adr1', '$adr2', '$streetno', '$floor', '$adr3', '$zip', '$city', '$country', '$languagepref', '$tel', '$mobil', '$email', '$birthday', '$club', '$password', '$status1', '$status2', '$status3', '$rights', '$privacy', '$ownupdate', '$created', '$changed', '$uid'";
$query = "insert into ff_persons ($fields) values ($values)";
$query = mac2ibm($query);
if(!($result = @mysql_query($query, $db_conn)))
{
echo("Error : $errstr\n");
Expand Down Expand Up @@ -313,7 +312,6 @@ function createuniqueorderno($puid, $status1 = 'new')
$fields = "puid, orderno, orderkey, status1";
$values = "'$puid', '$orderno', '$orderkey', '$status1'";
$query = "insert into ff_orderhead ($fields) values ($values)";
$query = mac2ibm($query);
$result = doquery($query);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ressources/.mysql_common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?
require(dirname(__FILE__) . "/../global_config.php");
require_once(dirname(__FILE__) . "/../global_config.php");
setlocale(LC_CTYPE, 'da_DK');

if (!$db_conn = @mysql_connect(GLOBAL_DB_HOST, GLOBAL_DB_USER, GLOBAL_DB_PASS))
Expand Down
2 changes: 1 addition & 1 deletion ressources/ajax/smsscript.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
require('../../global_config.php');
require_once('../../global_config.php');
unset($_GET["_"]);
require_once("class.inputfilter_clean.php");

Expand Down