diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php
index 5f5578422..fe5ea5c1a 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php
@@ -6,6 +6,13 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
class PasswordFormBuilder extends FormBuilder
{
protected $fields = [
+ 'old_password' => [
+ 'type' => 'anomaly.field_type.text',
+ 'required' => true,
+ 'config' => [
+ 'type' => 'password'
+ ],
+ ],
'new_password' => [
'type' => 'anomaly.field_type.text',
'required' => true,
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php
index ab88a1bd5..77b93ba91 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php
@@ -4,6 +4,7 @@ use Anomaly\Streams\Platform\Message\MessageBag;
use Anomaly\UsersModule\User\User;
use Anomaly\UsersModule\User\UserPassword;
use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
class PasswordFormHandler
{
@@ -20,6 +21,11 @@ class PasswordFormHandler
return;
}
+ if (!Hash::check($builder->getPostValue('old_password'), \auth()->user()->password)) {
+ $messages->error(trans('visiosoft.module.profile::message.wrong_password'));
+ return redirect()->back();
+ }
+
if ($builder->getPostValue('new_password') != $builder->getPostValue('re_new_password')) {
$messages->error(trans('visiosoft.module.profile::message.password_do_not_match'));
return redirect()->back();
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
index b005cf522..d93408d68 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
@@ -17,7 +17,9 @@ class ProfileFormBuilder extends FormBuilder
'state_of_education',
'profession',
'birthday',
- 'register_type'
+ 'register_type',
+ 'facebook_address',
+ 'google_address',
];
protected $actions = [
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
index 1b98c239f..2a93e5a21 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
@@ -23,6 +23,8 @@ class ProfileFormHandler
'identification_number' => $builder->getPostValue('identification_number'),
'birthday' => $builder->getPostValue('birthday'),
'register_type' => $builder->getPostValue('register_type'),
+ 'facebook_address' => $builder->getPostValue('facebook_address'),
+ 'google_address' => $builder->getPostValue('google_address'),
];
if (setting_value('visiosoft.module.profile::show_education_profession')) {
diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php
index a377a6535..cf4271066 100644
--- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php
+++ b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php
@@ -139,6 +139,16 @@ class UsersFieldsSeeder extends Seeder
'slug' => 'profession',
'type' => 'anomaly.field_type.text',
],
+ [
+ 'name' => trans('visiosoft.module.profile::field.facebook_address.name'),
+ 'slug' => 'facebook_address',
+ 'type' => 'anomaly.field_type.text',
+ ],
+ [
+ 'name' => trans('visiosoft.module.profile::field.google_address.name'),
+ 'slug' => 'google_address',
+ 'type' => 'anomaly.field_type.text',
+ ]
];
foreach ($customFields as $customField) {
diff --git a/app/Lang/Loader.php b/app/Lang/Loader.php
new file mode 100644
index 000000000..72f7728a0
--- /dev/null
+++ b/app/Lang/Loader.php
@@ -0,0 +1,266 @@
+
+ * @author Ryan Thompson
+ */
+class Loader extends FileLoader
+{
+
+ /**
+ * The runtime cache.
+ *
+ * @var array
+ */
+ protected static $disabled = [];
+
+ /**
+ * The streams path.
+ *
+ * @var string
+ */
+ protected $streams;
+
+ /**
+ * The addon collection instance.
+ *
+ * @var AddonCollection
+ */
+ protected $addons;
+
+ /**
+ * The application instance.
+ *
+ * @var Application
+ */
+ protected $application;
+
+ /**
+ * Create a new Loader instance.
+ *
+ * @param Filesystem $files
+ * @param string $path
+ */
+ public function __construct(Filesystem $files, $path)
+ {
+ $this->streams = base_path('vendor/visiosoft/streams-platform/resources/lang');
+
+ $this->application = app(Application::class);
+ $this->addons = app(AddonCollection::class);
+
+ parent::__construct($files, $path);
+ }
+
+ /**
+ * Load a locale from a given path.
+ *
+ * Keep streams overrides in place
+ * that are NOT namespaced cause
+ * we're overriding Laravel's
+ * base language files too.
+ *
+ * @param string $path
+ * @param string $locale
+ * @param string $group
+ * @return array
+ */
+ protected function loadPath($path, $locale, $group)
+ {
+ $lines = parent::loadPath($path, $locale, $group);
+
+ if ($path == $this->streams && $lines) {
+ $lines = $this->loadAddonOverrides($lines, $locale, $group);
+ $lines = $this->loadSystemOverrides($lines, $locale, $group);
+ $lines = $this->loadApplicationOverrides($lines, $locale, $group);
+ }
+
+ return $lines;
+ }
+
+ /**
+ * Load namespaced overrides from
+ * system AND application paths.
+ *
+ * @param array $lines
+ * @param string $locale
+ * @param string $group
+ * @param string $namespace
+ * @return array
+ */
+ protected function loadNamespaceOverrides(array $lines, $locale, $group, $namespace)
+ {
+ /**
+ * @deprecated since 1.6; Use manual loading or publishing.
+ */
+ if (env('AUTOMATIC_ADDON_OVERRIDES', true)) {
+ $lines = $this->loadAddonOverrides($lines, $locale, $group, $namespace);
+ }
+
+ $lines = $this->loadSystemOverrides($lines, $locale, $group, $namespace);
+ $lines = $this->loadApplicationOverrides($lines, $locale, $group, $namespace);
+
+ return parent::loadNamespaceOverrides($lines, $locale, $group, $namespace);
+ }
+
+ /**
+ * Load system overrides.
+ *
+ * @param array $lines
+ * @param $locale
+ * @param $group
+ * @param $namespace
+ * @return array
+ */
+ protected function loadSystemOverrides(array $lines, $locale, $group, $namespace = null)
+ {
+ if (!$namespace || $namespace == 'streams') {
+
+ $file = base_path("resources/streams/lang/{$locale}/{$group}.php");
+
+ if (is_dir(base_path("resources/streams/lang")) && $this->files->exists($file)) {
+ $lines = array_replace_recursive($lines, $this->files->getRequire($file));
+ }
+ }
+
+ if (str_is('*.*.*', $namespace)) {
+
+ list($vendor, $type, $slug) = explode('.', $namespace);
+
+ $file = base_path("resources/addons/{$vendor}/{$slug}-{$type}/lang/{$locale}/{$group}.php");
+
+ if (is_dir(base_path("resources/addons/{$vendor}/{$slug}-{$type}/lang")) && $this->files->exists($file)) {
+ $lines = array_replace_recursive($lines, $this->files->getRequire($file));
+ }
+ }
+
+ return $lines;
+ }
+
+ /**
+ * Load system overrides.
+ *
+ * @param array $lines
+ * @param $locale
+ * @param $group
+ * @param $namespace
+ * @return array
+ */
+ protected function loadApplicationOverrides(array $lines, $locale, $group, $namespace = null)
+ {
+ if (!$namespace || $namespace == 'streams') {
+
+ $file = $this->application->getResourcesPath("streams/lang/{$locale}/{$group}.php");
+
+ if (is_dir($this->application->getResourcesPath("streams/lang")) && $this->files->exists($file)) {
+ $lines = array_replace_recursive($lines, $this->files->getRequire($file));
+ }
+ }
+
+ if (str_is('*.*.*', $namespace)) {
+
+ list($vendor, $type, $slug) = explode('.', $namespace);
+
+ $file = $this->application->getResourcesPath(
+ "addons/{$vendor}/{$slug}-{$type}/lang/{$locale}/{$group}.php"
+ );
+
+ if (
+ is_dir($this->application->getResourcesPath("addons/{$vendor}/{$slug}-{$type}/lang"))
+ && $this->files->exists($file)
+ ) {
+ $lines = array_replace_recursive($lines, $this->files->getRequire($file));
+ }
+ }
+ if (config()->has('override_text')) {
+ foreach (config()->get('override_text') as $override) {
+ $override = explode(':', $override);
+
+ $lines = $this->findArrayValue($override[0], $override[1], $lines);
+ }
+ }
+
+ return $lines;
+ }
+
+ function replaceNewValue($find_value, $new_value, $arr)
+ {
+ if (is_array($arr)) {
+ foreach ($arr as $key => $item) {
+ $arr[$key] = $this->replaceNewValue($find_value, $new_value, $item);
+ }
+ return $arr;
+ }
+ if (strtolower($arr) == strtolower($find_value)) {
+ return $new_value;
+ }
+ return $arr;
+ }
+
+ function findArrayValue($find_value, $new_value, $arr)
+ {
+ foreach ($arr as $key => $item) {
+ $arr[$key] = $this->replaceNewValue($find_value, $new_value, $item);
+ }
+ return $arr;
+ }
+
+
+ /**
+ * @param array $lines
+ * @param $locale
+ * @param $group
+ * @param null $namespace
+ * @return array
+ */
+ protected function loadAddonOverrides(array $lines, $locale, $group, $namespace = null)
+ {
+ /** @var Addon $addon */
+ foreach ($this->addons->enabled() as $addon) {
+
+ $disabled = array_get(self::$disabled, $key = $addon->getNamespace('streams'), false);
+
+ if (!$disabled && !$this->files->isDirectory($addon->getPath('resources/streams'))) {
+ self::$disabled[$key] = $disabled = true;
+ }
+
+ if (!$disabled && (!$namespace || $namespace == 'streams')) {
+
+ $file = $addon->getPath("resources/streams/lang/{$locale}/{$group}.php");
+
+ if ($this->files->exists($file)) {
+ $lines = array_replace_recursive($lines, $this->files->getRequire($file));
+ }
+ }
+
+ $disabled = array_get(self::$disabled, $key = $addon->getNamespace('addons'), false);
+
+ if (!$disabled && !$this->files->isDirectory($addon->getPath('resources/addons'))) {
+ self::$disabled[$key] = $disabled = true;
+ }
+
+ if (!$disabled && str_is('*.*.*', $namespace)) {
+
+ list($vendor, $type, $slug) = explode('.', $namespace);
+
+ $file = $addon->getPath(
+ "resources/addons/{$vendor}/{$slug}-{$type}/lang/{$locale}/{$group}.php"
+ );
+
+ if ($this->files->exists($file)) {
+ $lines = array_replace_recursive($lines, $this->files->getRequire($file));
+ }
+ }
+ }
+
+ return $lines;
+ }
+}
diff --git a/app/Listeners/Translations.php b/app/Listeners/Translations.php
new file mode 100755
index 000000000..a891f3401
--- /dev/null
+++ b/app/Listeners/Translations.php
@@ -0,0 +1,45 @@
+singleton(
+ 'translation.loader',
+ function ($application) {
+ return new Loader($application['files'], $application['path.lang']);
+ }
+ );
+
+ app()->singleton(
+ 'translator',
+ function ($application) {
+ $loader = $application->make('translation.loader');
+
+ // When registering the translator component, we'll need to set the default
+ // locale as well as the fallback locale. So, we'll grab the application
+ // configuration so we can easily get both of these values from there.
+ $locale = $application['config']['app.locale'];
+
+ $trans = new Translator($loader, $locale);
+
+ $trans->setFallback($application['config']['app.fallback_locale']);
+
+ return $trans;
+ }
+ );
+
+ if (defined('LOCALE')) {
+ app()->setLocale(LOCALE);
+ config()->set('app.locale', LOCALE);
+ }
+ // Set our locale namespace.
+ app()->make('translator')->addNamespace('streams', realpath(__DIR__ . '/../../vendor/visiosoft/streams-platform/resources/lang'));
+
+ }
+}
diff --git a/config/streams.php b/config/streams.php
index a05e9b5d3..bc4d41f38 100644
--- a/config/streams.php
+++ b/config/streams.php
@@ -13,7 +13,11 @@ return [
|
*/
- 'listeners' => [],
+ 'listeners' => [
+ \Anomaly\Streams\Platform\Event\Booted::class => [
+ \App\Listeners\Translations::class
+ ],
+ ],
/*
|--------------------------------------------------------------------------
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 0fa39acbd..b90ff0f09 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,5 +1,7 @@
widgets = $widgets;
- $this->menus = $menus;
- $this->users = $users;
- $this->roles = $roles;
- $this->activator = $activator;
- }
+ public function __construct(
+ WidgetRepositoryInterface $widgets,
+ MenuRepositoryInterface $menus,
+ UserRepositoryInterface $users,
+ DiskRepositoryInterface $disks,
+ FolderRepositoryInterface $folders,
+ RoleRepositoryInterface $roles,
+ UserActivator $activator
+ )
+ {
+ $this->widgets = $widgets;
+ $this->menus = $menus;
+ $this->users = $users;
+ $this->roles = $roles;
+ $this->activator = $activator;
+ $this->disks = $disks;
+ $this->folders = $folders;
+ }
- public function run()
- {
+ public function run()
+ {
- $admin = $this->roles->findBySlug('admin');
+ $admin = $this->roles->findBySlug('admin');
- $this->users->unguard();
- $this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete();
- $visiosoft_administrator = $this->users->create(
- [
- 'display_name' => 'openclassify',
- 'email' => "info@openclassify.com",
- 'username' => "openclassify",
- 'password' => "openclassify",
- ]
- );
+ $this->users->unguard();
+ $this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete();
+ $visiosoft_administrator = $this->users->create(
+ [
+ 'display_name' => 'openclassify',
+ 'email' => "info@openclassify.com",
+ 'username' => "openclassify",
+ 'password' => "openclassify",
+ ]
+ );
- $visiosoft_administrator->roles()->sync([$admin->getId()]);
+ $visiosoft_administrator->roles()->sync([$admin->getId()]);
- $this->activator->force($visiosoft_administrator);
+ $this->activator->force($visiosoft_administrator);
- //Footer Link
- LinkModel::query()->forceDelete();
- $repository = new EntryRepository();
- $repository->setModel(new UrlLinkTypeModel());
- $menu = $this->menus->findBySlug('footer');
+ //Footer Link
+ LinkModel::query()->forceDelete();
+ $repository = new EntryRepository();
+ $repository->setModel(new UrlLinkTypeModel());
+ $menu = $this->menus->findBySlug('footer');
- $openclassify = $repository->create(
- [
- 'en' => [
- 'title' => 'OpenClassify.com',
- ],
- 'url' => 'https://openclassify.com/',
- ]
- );
- $visiosoft = $repository->create(
- [
- 'en' => [
- 'title' => 'Visiosoft Inc.',
- ],
- 'url' => 'https://visiosoft.com.tr/',
- ]
- );
+ $openclassify = $repository->create(
+ [
+ 'en' => [
+ 'title' => 'OpenClassify.com',
+ ],
+ 'url' => 'https://openclassify.com/',
+ ]
+ );
+ $visiosoft = $repository->create(
+ [
+ 'en' => [
+ 'title' => 'Visiosoft Inc.',
+ ],
+ 'url' => 'https://visiosoft.com.tr/',
+ ]
+ );
- LinkModel::query()->create(
- [
- 'menu' => $menu,
- 'target' => '_blank',
- 'entry' => $openclassify,
- 'type' => 'anomaly.extension.url_link_type',
- ]
- );
- LinkModel::query()->create(
- [
- 'menu' => $menu,
- 'target' => '_blank',
- 'entry' => $visiosoft,
- 'type' => 'anomaly.extension.url_link_type',
- ]
- );
+ LinkModel::query()->create(
+ [
+ 'menu' => $menu,
+ 'target' => '_blank',
+ 'entry' => $openclassify,
+ 'type' => 'anomaly.extension.url_link_type',
+ ]
+ );
+ LinkModel::query()->create(
+ [
+ 'menu' => $menu,
+ 'target' => '_blank',
+ 'entry' => $visiosoft,
+ 'type' => 'anomaly.extension.url_link_type',
+ ]
+ );
- DB::table('files_files')->truncate();
+ DB::table('files_files')->truncate();
- $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/";
- file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r'));
- file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r'));
- file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r'));
- file_put_contents(storage_path('images.zip'), fopen($repository . "images.zip", "r"));
- file_put_contents(storage_path('cats.zip'), fopen($repository . "cats.zip", "r"));
+ $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/";
+ file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r'));
+ file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r'));
+ file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r'));
+ file_put_contents(storage_path('images.zip'), fopen($repository . "images.zip", "r"));
+ file_put_contents(storage_path('cats.zip'), fopen($repository . "cats.zip", "r"));
- Model::unguard();
- DB::unprepared(file_get_contents(storage_path('advs.sql')));
- DB::unprepared(file_get_contents(storage_path('categories.sql')));
- DB::unprepared(file_get_contents(storage_path('settings.sql')));
- Model::reguard();
+ Model::unguard();
+ DB::unprepared(file_get_contents(storage_path('advs.sql')));
+ DB::unprepared(file_get_contents(storage_path('categories.sql')));
+ DB::unprepared(file_get_contents(storage_path('settings.sql')));
+ Model::reguard();
- $zip = new ZipArchive();
- $zip->open(storage_path('images.zip'), ZipArchive::CREATE);
- $zip->extractTo(storage_path('streams/default/files-module/local/images/'));
- $zip->open(storage_path('cats.zip'), ZipArchive::CREATE);
- $zip->extractTo(storage_path('streams/default/files-module/local/images/'));
- $zip->close();
+ $zip = new ZipArchive();
+ $zip->open(storage_path('images.zip'), ZipArchive::CREATE);
+ $zip->extractTo(storage_path('streams/default/files-module/local/images/'));
+ $zip->open(storage_path('cats.zip'), ZipArchive::CREATE);
+ $zip->extractTo(storage_path('streams/default/files-module/local/images/'));
+ $zip->close();
- $this->call(widgetSeeder::class);
- }
+ $this->call(widgetSeeder::class);
+
+
+ //Create Store Icon Folder
+ if (!$this->folders->findBySlug('ads_excel')) {
+ $disk = $this->disks->findBySlug('local');
+
+ $this->folders->create([
+ 'en' => [
+ 'name' => 'Ads Excel',
+ 'description' => 'A folder for Ads Excel.',
+ ],
+ 'slug' => 'ads_excel',
+ 'disk' => $disk
+ ]);
+ };
+
+ if ($images_folder = $this->folders->findBySlug('images')) {
+ $images_folder->update([
+ 'allowed_types' => [
+ 'jpg', 'jpeg','png'
+ ],
+ ]);
+ }
+ }
}