This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
version: '3' | |
services: | |
vpn: | |
image: hwdsl2/ipsec-vpn-server | |
restart: always | |
environment: | |
- VPN_IPSEC_PSK=my-shared-secret | |
- VPN_USER=my-username | |
- VPN_PASSWORD=my-password |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
class User | |
{ | |
private $name; | |
public function setName($name) | |
{ | |
$this->name = $name; | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CREATE DATABASE mydb CHARACTER SET utf8; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CREATE TABLE `categories` ( | |
`id` INT(11) NOT NULL AUTO_INCREMENT, | |
`name` VARCHAR(255) NOT NULL, | |
`description` TEXT, | |
PRIMARY KEY (`id`) | |
) ENGINE = InnoDB; | |
CREATE TABLE `products` ( | |
`id` INT(11) NOT NULL AUTO_INCREMENT, | |
`category_id` INT(11) NOT NULL, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CREATE TABLE `categories` ( | |
`id` INT(11) NOT NULL AUTO_INCREMENT, | |
`name` VARCHAR(255) NOT NULL, | |
`description` TEXT, | |
PRIMARY KEY (`id`) | |
) ENGINE = InnoDB; | |
CREATE TABLE `products` ( | |
`id` INT(11) NOT NULL AUTO_INCREMENT, | |
`category_id` INT(11) NOT NULL, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
version: '3.3' | |
services: | |
mysql: | |
image: mysql:5.7.21 | |
ports: | |
- "3306:3306" | |
environment: | |
MYSQL_ROOT_PASSWORD: root |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
version: '3.3' | |
services: | |
mysql: | |
image: mysql:5.7.21 | |
ports: | |
- "3306:3306" | |
environment: | |
MYSQL_ROOT_PASSWORD: root |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = vsguts | |
email = vsguts@gmail.com | |
[github] | |
user = vsguts | |
token = 055666e14e958b9574181ae733c4ad0b | |
[color] | |
diff = auto | |
status = auto | |
branch = auto |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/functions/fn.companies.php b/app/functions/fn.companies.php | |
index 91c5225..8e9d18f 100644 | |
--- a/app/functions/fn.companies.php | |
+++ b/app/functions/fn.companies.php | |
@@ -1318,6 +1318,9 @@ function fn_create_company_admin($company_data, $fields = '', $notify = false) | |
$user['b_firstname'] = $user['s_firstname'] = $user['firstname']; | |
$user['lastname'] = (!empty($company_data['admin_lastname'])) ? $company_data['admin_lastname'] : ''; | |
$user['b_lastname'] = $user['s_lastname'] = $user['lastname']; | |
+ $user['b_phone'] = $user['s_phone'] = $user['phone'] = $company_data['phone']; | |
+ $user['fax'] = $company_data['fax']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/Tygh/Database/Connection.php b/app/Tygh/Database/Connection.php | |
index f6f75c3..f8eb039 100644 | |
--- a/app/Tygh/Database/Connection.php | |
+++ b/app/Tygh/Database/Connection.php | |
@@ -287,9 +287,10 @@ class Connection | |
$this->db->freeResult($_result); | |
+ return is_array($result) ? $result : array(); | |
} |
NewerOlder