Replace 4.3.0 by 4.3.1

Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com>

.drone.yml

@@ -3,152 +3,49 @@ kind: pipeline
 name: default
 
 steps:
-  - name: composer
-    image: joomlaprojects/docker-images:php8.2
-    volumes:
-      - name: composer-cache
-        path: /tmp/composer-cache
+  - name: weblinks-codeception-tests
+    image: joomlaprojects/docker-systemtests:latest
     commands:
-      - composer install --no-progress
-
-  - name: phpcs
-    image: joomlaprojects/docker-images:php8.1
-    depends_on: [ composer ]
-    commands:
-      - echo $(date)
-      - ./vendor/bin/php-cs-fixer fix -vvv --dry-run --diff
-      - ./vendor/bin/phpcs --extensions=php -p --standard=ruleset.xml src/
-      - echo $(date)
-
-  - name: npm
-    image: node:16-bullseye-slim
-    depends_on: [ phpcs ]
-    volumes:
-      - name: npm-cache
-        path: /tmp/npm-cache
-    environment:
-      npm_config_cache: /tmp/npm-cache
-    commands:
-      - npm i --unsafe-perm
-
-  - name: prepare_system_tests
-    depends_on: [ npm ]
-    image: joomlaprojects/docker-images:systemtests
-    volumes:
-      - name: cypress-cache
-        path: /root/.cache/Cypress
-    commands:
-      - mv cypress.config.dist.js cypress.config.js
-      - npx cypress install
-      - npx cypress verify
-      - vendor/bin/robo build
-      - curl https://joomla.org/latest -L --output joomla.zip
-      - mkdir joomla
-      - cp joomla.zip joomla/joomla.zip
-      - cd joomla
-      - unzip joomla.zip
-
-  - name: phan
-    image: joomlaprojects/docker-images:php8.1-ast
-    depends_on: [ prepare_system_tests ]
-    failure: ignore
-    commands:
-      - vendor/bin/phan
-
-  - name: phpstan
-    image: joomlaprojects/docker-images:php8.1
-    depends_on: [ prepare_system_tests ]
-    failure: ignore
-    commands:
-      - vendor/bin/phpstan analyse src
-
-  - name: phpmin-system-mysql
-    depends_on: [ prepare_system_tests ]
-    image: joomlaprojects/docker-images:cypress
-    volumes:
-      - name: cypress-cache
-        path: /root/.cache/Cypress
-    commands:
-      - mkdir /tests/www/mysql/
-      - cp joomla.zip /tests/www/mysql/joomla.zip
-      - cp dist/pkg-weblinks-current.zip /tests/www/mysql/pkg-weblinks-current.zip
-      - cd /tests/www/mysql/
-      - unzip joomla.zip
-      - apache2ctl -D FOREGROUND &
-      - chmod +rwx /root
-      - php installation/joomla.php install --verbose --site-name="Joomla CMS test" --admin-email=admin@example.org --admin-username=ci-admin --admin-user="jane doe" --admin-password=joomla-17082005 --db-type=mysqli --db-host=mysql --db-name=test_joomla --db-pass=joomla_ut --db-user=root --db-encryption=0 --db-prefix=mysql_
-      - php cli/joomla.php config:set debug=true error_reporting=maximum
-      - php cli/joomla.php extension:install --path=/tests/www/mysql/pkg-weblinks-current.zip
-      - chmod -R 777 /tests/www/mysql/
-      - chown -R www-data /tests/www/mysql/
-      - cd /drone/src
-      - npx cypress run --browser=firefox --e2e --config baseUrl=http://localhost/mysql,screenshotsFolder=/drone/src/tests/cypress/output/screenshots
+      - composer install
+      - chmod a+x .drone/build.sh
+      - ./.drone/build.sh
+      - apache2ctl start
+      - service mysql start
+      - cd /tests/www
+      - export DISPLAY=:0
+      - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
+      - sleep 3
+      - fluxbox  > /dev/null 2>&1 &
+      - vendor/bin/robo run:tests
 
   - name: artifacts-system-tests
-    image: joomlaprojects/docker-images:packager
-    depends_on:
-      - phpmin-system-mysql
+    image: cschlosser/drone-ftps
+    depends_on: [ weblinks-codeception-tests ]
     environment:
       FTP_USERNAME:
         from_secret: ftpusername
       FTP_PASSWORD:
         from_secret: ftppassword
-      GITHUB_TOKEN:
-        from_secret: github_token
+      PLUGIN_HOSTNAME: ci.joomla.org:21
+      PLUGIN_SRC_DIR: /tests/_output/
+      PLUGIN_DEST_DIR: /artifacts
+      PLUGIN_SECURE: false
+      PLUGIN_EXCLUDE: ^\.git/$
     commands:
-      - export PLUGIN_DEST_DIR=/artifacts/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
-      - echo https://ci.joomla.org$PLUGIN_DEST_DIR
-      - rclone config create artifacts ftp host ci.joomla.org user $FTP_USERNAME port 21 pass $FTP_PASSWORD
-      - rclone mkdir artifacts:$PLUGIN_DEST_DIR
-      - rclone copy tests/cypress/output/ artifacts:$PLUGIN_DEST_DIR
-      - 'curl -X POST "https://api.github.com/repos/$DRONE_REPO/statuses/$DRONE_COMMIT" -H "Content-Type: application/json" -H "Authorization: token $GITHUB_TOKEN" -d "{\"state\":\"failure\", \"context\": \"Artifacts from Failure\", \"description\": \"You can find artifacts from the failure of the build here:\", \"target_url\": \"https://ci.joomla.org$PLUGIN_DEST_DIR\"}" > /dev/null'
+      - export PLUGIN_DEST_DIR=$PLUGIN_DEST_DIR/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST_$DRONE_BUILD_NUMBER/system-tests
+      - echo https://ci.joomla.org:444$PLUGIN_DEST_DIR
+      - /bin/upload.sh
     when:
       status:
-        - failure
+      - failure
 
 volumes:
   - name: weblinks_cache
     host:
       path: /tmp/weblinks_cache
-  - name: composer-cache
-    host:
-      path: /tmp/composer-cache
-  - name: cypress-cache
-    host:
-      path: /tmp/cypress-cache
-  - name: npm-cache
-    host:
-      path: /tmp/npm-cache
-
-services:
-  - name: mysql
-    image: mysql:5.7
-    environment:
-      MYSQL_USER: joomla_ut
-      MYSQL_PASSWORD: joomla_ut
-      MYSQL_ROOT_PASSWORD: joomla_ut
-      MYSQL_DATABASE: test_joomla
-
-  - name: mysql8
-    image: mysql:8
-    command: ["--default-authentication-plugin=mysql_native_password"]
-    environment:
-      MYSQL_USER: joomla_ut
-      MYSQL_PASSWORD: joomla_ut
-      MYSQL_ROOT_PASSWORD: joomla_ut
-      MYSQL_DATABASE: test_joomla
-
-  - name: postgres
-    image: postgres:11-alpine
-    ports:
-      - 5432
-    environment:
-      POSTGRES_USER: root
-      POSTGRES_PASSWORD: joomla_ut
-      POSTGRES_DB: test_joomla
 
 ---
 kind: signature
-hmac: 8b2b4e6fe85da897755c46d961b49c1e53a13e5a2cf6df5cde70aa07233b2494
+hmac: 9346f0e74d2605ebe7bc9d33ad0588c1073ba3a9d9b254b71a7a85e219089449
 
 ...

.drone/build.sh

@@ -22,8 +22,6 @@ cd /tests/www
 cp jorobo.dist.ini jorobo.ini
 cp RoboFile.dist.ini RoboFile.ini
 
-
-
 # Build package
 vendor/bin/robo build --dev
 

.editorconfig

@@ -1,20 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style end of lines and a blank line at the end of the file
-[*]
-indent_style = tab
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.php]
-indent_style = space
-indent_size = 4
-
-[*.{js,json,scss,css,yml,vue}]
-indent_style = space
-indent_size = 2

.gitignore

@@ -1,73 +1,64 @@
-# Builds
-build
-releases
-
-# OSX
-.DS_Store
-._*
-.Spotlight-V100
-.Trashes
-
-# Windows
-Thumbs.db
-Desktop.ini
-
-# PHPStorm
-.idea/
-
-# Sublime Text
-*.sublime*
-
-# Eclipse
-.buildpath
-.project
-.settings
-
-# Temp files
-*.tmp
-*.bak
-*.swp
-*~.nib
-*~
-
-# Phing
-build.properties
-phing-latest.phar
-
-# Github pages and Jekyll files
-/_site/
-/Gemfile
-/Gemfile.lock
-
-# composer
-composer.phar
-vendor/*
-
-# Robo
-robo.phar
-RoboFile.ini
-
-# Test related files
-tests/acceptance.suite.yml
-tests/*/*Tester.php
-tests/_support/_generated/*TesterActions.php
-tests/joomla*
-tests/_output*
-selenium-server-standalone.jar
-codecept.phar
-selenium.log
-tests/cache
-
-#cypress
-node_modules
-/tests/cypress/output/screenshots
-!/tests/cypress/output/screenshots/.gitkeep
-/tests/cypress/output/videos
-!/tests/cypress/output/videos/.gitkeep
-cypress.config.js
-joomla
-
-# Package building related
-/dist
-jorobo.ini
-
+# Builds
+build
+releases
+
+# OSX
+.DS_Store
+._*
+.Spotlight-V100
+.Trashes
+
+# Windows
+Thumbs.db
+Desktop.ini
+
+# PHPStorm
+.idea/
+
+# Sublime Text
+*.sublime*
+
+# Eclipse
+.buildpath
+.project
+.settings
+
+# Temp files
+*.tmp
+*.bak
+*.swp
+*~.nib
+*~
+
+# Phing
+build.properties
+phing-latest.phar
+
+# Github pages and Jekyll files
+/_site/
+/Gemfile
+/Gemfile.lock
+
+# composer
+composer.phar
+vendor/*
+
+# Robo
+robo.phar
+RoboFile.ini
+
+# Test related files
+tests/acceptance.suite.yml
+tests/*/*Tester.php
+tests/_support/_generated/*TesterActions.php
+tests/joomla*
+tests/_output*
+selenium-server-standalone.jar
+codecept.phar
+selenium.log
+tests/cache
+
+# Package building related
+/dist
+jorobo.ini
+

.phan/config.php

@@ -1,350 +0,0 @@
-<?php
-
-/**
- * This configuration file was automatically generated by 'phan --init --init-level=5'
- *
- * TODOs (added by 'phan --init'):
- *
- * - Go through this file and verify that there are no missing/unnecessary files/directories.
- *   (E.g. this only includes direct composer dependencies - You may have to manually add indirect composer dependencies to 'directory_list')
- * - Look at 'plugins' and add or remove plugins if appropriate (see https://github.com/phan/phan/tree/v4/.phan/plugins#plugins)
- * - Add global suppressions for pre-existing issues to suppress_issue_types (https://github.com/phan/phan/wiki/Tutorial-for-Analyzing-a-Large-Sloppy-Code-Base)
- *   - Consider setting up a baseline if there are a large number of pre-existing issues (see `phan --extended-help`)
- *
- * This configuration will be read and overlaid on top of the
- * default configuration. Command line arguments will be applied
- * after this file is read.
- *
- * @see https://github.com/phan/phan/wiki/Phan-Config-Settings for all configurable options
- * @see https://github.com/phan/phan/tree/v4/src/Phan/Config.php
- *
- * A Note About Paths
- * ==================
- *
- * Files referenced from this file should be defined as
- *
- * ```
- *   Config::projectPath('relative_path/to/file')
- * ```
- *
- * where the relative path is relative to the root of the
- * project which is defined as either the working directory
- * of the phan executable or a path passed in via the CLI
- * '-d' flag.
- */
-
-use Phan\Issue;
-
-return [
-
-    // The PHP version that the codebase will be checked for compatibility against.
-    // For best results, the PHP binary used to run Phan should have the same PHP version.
-    // (Phan relies on Reflection for some types, param counts,
-    // and checks for undefined classes/methods/functions)
-    //
-    // Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, `'7.4'`, `null`.
-    // If this is set to `null`,
-    // then Phan assumes the PHP version which is closest to the minor version
-    // of the php executable used to execute Phan.
-    //
-    // Note that the **only** effect of choosing `'5.6'` is to infer that functions removed in php 7.0 exist.
-    // (See `backward_compatibility_checks` for additional options)
-    // Automatically inferred from composer.json requirement for "php" of "^7.2.5"
-    'target_php_version' => '8.1',
-
-    // If enabled, missing properties will be created when
-    // they are first seen. If false, we'll report an
-    // error message if there is an attempt to write
-    // to a class property that wasn't explicitly
-    // defined.
-    'allow_missing_properties' => true,
-
-    // If enabled, null can be cast to any type and any
-    // type can be cast to null. Setting this to true
-    // will cut down on false positives.
-    'null_casts_as_any_type' => true,
-
-    // If enabled, allow null to be cast as any array-like type.
-    //
-    // This is an incremental step in migrating away from `null_casts_as_any_type`.
-    // If `null_casts_as_any_type` is true, this has no effect.
-    'null_casts_as_array' => true,
-
-    // If enabled, allow any array-like type to be cast to null.
-    // This is an incremental step in migrating away from `null_casts_as_any_type`.
-    // If `null_casts_as_any_type` is true, this has no effect.
-    'array_casts_as_null' => true,
-
-    // If enabled, scalars (int, float, bool, string, null)
-    // are treated as if they can cast to each other.
-    // This does not affect checks of array keys. See `scalar_array_key_cast`.
-    'scalar_implicit_cast' => true,
-
-    // If enabled, any scalar array keys (int, string)
-    // are treated as if they can cast to each other.
-    // E.g. `array<int,stdClass>` can cast to `array<string,stdClass>` and vice versa.
-    // Normally, a scalar type such as int could only cast to/from int and mixed.
-    'scalar_array_key_cast' => true,
-
-    // If this has entries, scalars (int, float, bool, string, null)
-    // are allowed to perform the casts listed.
-    //
-    // E.g. `['int' => ['float', 'string'], 'float' => ['int'], 'string' => ['int'], 'null' => ['string']]`
-    // allows casting null to a string, but not vice versa.
-    // (subset of `scalar_implicit_cast`)
-    'scalar_implicit_partial' => [],
-
-    // If enabled, Phan will warn if **any** type in a method invocation's object
-    // is definitely not an object,
-    // or if **any** type in an invoked expression is not a callable.
-    // Setting this to true will introduce numerous false positives
-    // (and reveal some bugs).
-    'strict_method_checking' => false,
-
-    // If enabled, Phan will warn if **any** type of the object expression for a property access
-    // does not contain that property.
-    'strict_object_checking' => false,
-
-    // If enabled, Phan will warn if **any** type in the argument's union type
-    // cannot be cast to a type in the parameter's expected union type.
-    // Setting this to true will introduce numerous false positives
-    // (and reveal some bugs).
-    'strict_param_checking' => false,
-
-    // If enabled, Phan will warn if **any** type in a property assignment's union type
-    // cannot be cast to a type in the property's declared union type.
-    // Setting this to true will introduce numerous false positives
-    // (and reveal some bugs).
-    'strict_property_checking' => false,
-
-    // If enabled, Phan will warn if **any** type in a returned value's union type
-    // cannot be cast to the declared return type.
-    // Setting this to true will introduce numerous false positives
-    // (and reveal some bugs).
-    'strict_return_checking' => false,
-
-    // If true, seemingly undeclared variables in the global
-    // scope will be ignored.
-    //
-    // This is useful for projects with complicated cross-file
-    // globals that you have no hope of fixing.
-    'ignore_undeclared_variables_in_global_scope' => true,
-
-    // Set this to false to emit `PhanUndeclaredFunction` issues for internal functions that Phan has signatures for,
-    // but aren't available in the codebase, or from Reflection.
-    // (may lead to false positives if an extension isn't loaded)
-    //
-    // If this is true(default), then Phan will not warn.
-    //
-    // Even when this is false, Phan will still infer return values and check parameters of internal functions
-    // if Phan has the signatures.
-    'ignore_undeclared_functions_with_known_signatures' => true,
-
-    // Backwards Compatibility Checking. This is slow
-    // and expensive, but you should consider running
-    // it before upgrading your version of PHP to a
-    // new version that has backward compatibility
-    // breaks.
-    //
-    // If you are migrating from PHP 5 to PHP 7,
-    // you should also look into using
-    // [php7cc (no longer maintained)](https://github.com/sstalle/php7cc)
-    // and [php7mar](https://github.com/Alexia/php7mar),
-    // which have different backwards compatibility checks.
-    //
-    // If you are still using versions of php older than 5.6,
-    // `PHP53CompatibilityPlugin` may be worth looking into if you are not running
-    // syntax checks for php 5.3 through another method such as
-    // `InvokePHPNativeSyntaxCheckPlugin` (see .phan/plugins/README.md).
-    'backward_compatibility_checks' => false,
-
-    // If true, check to make sure the return type declared
-    // in the doc-block (if any) matches the return type
-    // declared in the method signature.
-    'check_docblock_signature_return_type_match' => true,
-
-    // This setting maps case-insensitive strings to union types.
-    //
-    // This is useful if a project uses phpdoc that differs from the phpdoc2 standard.
-    //
-    // If the corresponding value is the empty string,
-    // then Phan will ignore that union type (E.g. can ignore 'the' in `@return the value`)
-    //
-    // If the corresponding value is not empty,
-    // then Phan will act as though it saw the corresponding UnionTypes(s)
-    // when the keys show up in a UnionType of `@param`, `@return`, `@var`, `@property`, etc.
-    //
-    // This matches the **entire string**, not parts of the string.
-    // (E.g. `@return the|null` will still look for a class with the name `the`, but `@return the` will be ignored with the below setting)
-    //
-    // (These are not aliases, this setting is ignored outside of doc comments).
-    // (Phan does not check if classes with these names exist)
-    //
-    // Example setting: `['unknown' => '', 'number' => 'int|float', 'char' => 'string', 'long' => 'int', 'the' => '']`
-    'phpdoc_type_mapping' => [],
-
-    // Set to true in order to attempt to detect dead
-    // (unreferenced) code. Keep in mind that the
-    // results will only be a guess given that classes,
-    // properties, constants and methods can be referenced
-    // as variables (like `$class->$property` or
-    // `$class->$method()`) in ways that we're unable
-    // to make sense of.
-    //
-    // To more aggressively detect dead code,
-    // you may want to set `dead_code_detection_prefer_false_negative` to `false`.
-    'dead_code_detection' => false,
-
-    // Set to true in order to attempt to detect unused variables.
-    // `dead_code_detection` will also enable unused variable detection.
-    //
-    // This has a few known false positives, e.g. for loops or branches.
-    'unused_variable_detection' => false,
-
-    // Set to true in order to attempt to detect redundant and impossible conditions.
-    //
-    // This has some false positives involving loops,
-    // variables set in branches of loops, and global variables.
-    'redundant_condition_detection' => false,
-
-    // If enabled, Phan will act as though it's certain of real return types of a subset of internal functions,
-    // even if those return types aren't available in reflection (real types were taken from php 7.3 or 8.0-dev, depending on target_php_version).
-    //
-    // Note that with php 7 and earlier, php would return null or false for many internal functions if the argument types or counts were incorrect.
-    // As a result, enabling this setting with target_php_version 8.0 may result in false positives for `--redundant-condition-detection` when codebases also support php 7.x.
-    'assume_real_types_for_internal_functions' => false,
-
-    // If true, this runs a quick version of checks that takes less
-    // time at the cost of not running as thorough
-    // of an analysis. You should consider setting this
-    // to true only when you wish you had more **undiagnosed** issues
-    // to fix in your code base.
-    //
-    // In quick-mode the scanner doesn't rescan a function
-    // or a method's code block every time a call is seen.
-    // This means that the problem here won't be detected:
-    //
-    // ```php
-    // <?php
-    // function test($arg):int {
-    //     return $arg;
-    // }
-    // test("abc");
-    // ```
-    //
-    // This would normally generate:
-    //
-    // ```
-    // test.php:3 PhanTypeMismatchReturn Returning type string but test() is declared to return int
-    // ```
-    //
-    // The initial scan of the function's code block has no
-    // type information for `$arg`. It isn't until we see
-    // the call and rescan `test()`'s code block that we can
-    // detect that it is actually returning the passed in
-    // `string` instead of an `int` as declared.
-    'quick_mode' => false,
-
-    // Override to hardcode existence and types of (non-builtin) globals in the global scope.
-    // Class names should be prefixed with `\`.
-    //
-    // (E.g. `['_FOO' => '\FooClass', 'page' => '\PageClass', 'userId' => 'int']`)
-    'globals_type_map' => [],
-
-    // The minimum severity level to report on. This can be
-    // set to `Issue::SEVERITY_LOW`, `Issue::SEVERITY_NORMAL` or
-    // `Issue::SEVERITY_CRITICAL`. Setting it to only
-    // critical issues is a good place to start on a big
-    // sloppy mature code base.
-    'minimum_severity' => Issue::SEVERITY_NORMAL,
-
-    // Add any issue types (such as `'PhanUndeclaredMethod'`)
-    // to this list to inhibit them from being reported.
-    'suppress_issue_types' => ['PhanDeprecatedClass', 'PhanUndeclaredConstant','PhanDeprecatedFunction'],
-
-    // A regular expression to match files to be excluded
-    // from parsing and analysis and will not be read at all.
-    //
-    // This is useful for excluding groups of test or example
-    // directories/files, unanalyzable files, or files that
-    // can't be removed for whatever reason.
-    // (e.g. `'@Test\.php$@'`, or `'@vendor/.*/(tests|Tests)/@'`)
-    'exclude_file_regex' => '',
-
-    // A list of files that will be excluded from parsing and analysis
-    // and will not be read at all.
-    //
-    // This is useful for excluding hopelessly unanalyzable
-    // files that can't be removed for whatever reason.
-    'exclude_file_list' => [
-    ],
-
-    // A directory list that defines files that will be excluded
-    // from static analysis, but whose class and method
-    // information should be included.
-    //
-    // Generally, you'll want to include the directories for
-    // third-party code (such as "vendor/") in this list.
-    //
-    // n.b.: If you'd like to parse but not analyze 3rd
-    //       party code, directories containing that code
-    //       should be added to the `directory_list` as well as
-    //       to `exclude_analysis_directory_list`.
-    'exclude_analysis_directory_list' => [
-        'joomla/administrator/components/com_finder/src/Indexer',
-        'joomla/libraries'
-    ],
-
-    // Enable this to enable checks of require/include statements referring to valid paths.
-    // The settings `include_paths` and `warn_about_relative_include_statement` affect the checks.
-    'enable_include_path_checks' => false,
-
-    // The number of processes to fork off during the analysis
-    // phase.
-    'processes' => 1,
-
-    // List of case-insensitive file extensions supported by Phan.
-    // (e.g. `['php', 'html', 'htm']`)
-    'analyzed_file_extensions' => [
-        'php',
-    ],
-
-    // You can put paths to stubs of internal extensions in this config option.
-    // If the corresponding extension is **not** loaded, then Phan will use the stubs instead.
-    // Phan will continue using its detailed type annotations,
-    // but load the constants, classes, functions, and classes (and their Reflection types)
-    // from these stub files (doubling as valid php files).
-    // Use a different extension from php to avoid accidentally loading these.
-    // The `tools/make_stubs` script can be used to generate your own stubs (compatible with php 7.0+ right now)
-    //
-    // (e.g. `['xdebug' => '.phan/internal_stubs/xdebug.phan_php']`)
-    'autoload_internal_extension_signatures' => [
-    ],
-
-    // A list of plugin files to execute.
-    //
-    // Plugins which are bundled with Phan can be added here by providing their name (e.g. `'AlwaysReturnPlugin'`)
-    //
-    // Documentation about available bundled plugins can be found [here](https://github.com/phan/phan/tree/v4/.phan/plugins).
-    //
-    // Alternately, you can pass in the full path to a PHP file with the plugin's implementation (e.g. `'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'`)
-    'plugins' => [],
-
-    // A list of directories that should be parsed for class and
-    // method information. After excluding the directories
-    // defined in `exclude_analysis_directory_list`, the remaining
-    // files will be statically analyzed for errors.
-    //
-    // Thus, both first-party and third-party code being used by
-    // your application should be included in this list.
-    'directory_list' => [
-        'src',
-        'joomla/administrator/components/com_finder/src/Indexer',
-        'joomla/libraries'
-    ],
-
-    // A list of individual files to include in analysis
-    // with a path relative to the root directory of the
-    // project.
-    'file_list' => [],
-];

.php-cs-fixer.dist.php

@@ -1,67 +0,0 @@
-<?php
-/**
- * @package    Joomla.Site
- *
- * @copyright  (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-/**
- * This is the configuration file for php-cs-fixer
- *
- * @see https://github.com/FriendsOfPHP/PHP-CS-Fixer
- * @see https://mlocati.github.io/php-cs-fixer-configurator/#version:3.0
- *
- *
- * If you would like to run the automated clean up, then open a command line and type one of the commands below
- *
- * To run a quick dry run to see the files that would be modified:
- *
- *        ./component/backend/vendor/bin/php-cs-fixer fix --dry-run
- *
- * To run a full check, with automated fixing of each problem :
- *
- *        ./component/backend/vendor/bin/php-cs-fixer fix
- *
- * You can run the clean up on a single file if you need to, this is faster
- *
- *        ./component/backend/vendor/bin/php-cs-fixer fix --dry-run administrator/index.php
- *        ./component/backend/vendor/bin/php-cs-fixer fix administrator/index.php
- */
-
-// Add all the core Joomla folders
-$finder = PhpCsFixer\Finder::create()
-    ->in(
-        [
-            __DIR__ . '/src',
-        ]
-    )
-    // Ignore template files as PHP CS fixer can't handle them properly
-    // https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/3702#issuecomment-396717120
-    ->notPath('/vendor/')
-    ->notPath('/tmpl/');
-
-$config = new PhpCsFixer\Config();
-$config
-    ->setRiskyAllowed(true)
-    ->setHideProgress(false)
-    ->setUsingCache(false)
-    ->setRules(
-        [
-            // Basic ruleset is PSR 12
-            '@PSR12'                         => true,
-            // Short array syntax
-            'array_syntax'                   => ['syntax' => 'short'],
-            // Lists should not have a trailing comma like list($foo, $bar,) = ...
-            'no_trailing_comma_in_list_call' => true,
-            // Arrays on multiline should have a trailing comma
-            'trailing_comma_in_multiline'    => ['elements' => ['arrays']],
-            // Align elements in multiline array and variable declarations on new lines below each other
-            'binary_operator_spaces'         => ['operators' => ['=>' => 'align_single_space_minimal', '=' => 'align']],
-            // The "No break" comment in switch statements
-            'no_break_comment'               => ['comment_text' => 'No break'],
-        ]
-    )
-    ->setFinder($finder);
-
-return $config;

.travis.yml

@@ -0,0 +1,54 @@
+sudo: true
+language: php
+services:
+  - xvfb
+
+env:
+  global:
+    - RUN_PHPCS="no"
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.6
+      env: RUN_PHPCS="yes"
+    - php: 7.0
+      sudo: true
+      addons:
+        firefox: 'latest-esr'
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+
+before_script:
+# Forcing localhost in hosts file
+- sudo sed -i '1s/^/127.0.0.1 localhost\n/' /etc/hosts
+- sudo apt-get update -qq
+- sudo apt-get install -y --force-yes apache2 libapache2-mod-fastcgi > /dev/null
+- sudo mkdir $(pwd)/.run
+- chmod a+x tests/travis-php-fpm.sh
+- sudo ./tests/travis-php-fpm.sh $USER $(phpenv version-name)
+- sudo a2enmod rewrite actions fastcgi alias
+- echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+- ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+- sudo cp -f tests/travis-ci-apache.conf /etc/apache2/sites-available/default
+- sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
+- sudo sed -e "s?%PHPVERSION%?${TRAVIS_PHP_VERSION:0:1}?g" --in-place /etc/apache2/sites-available/default
+- git submodule update --init --recursive
+- sudo service apache2 restart
+# Fluxbox
+- sudo apt-get install fluxbox -y --force-yes
+- fluxbox &
+- sleep 3 # give fluxbox some time to start
+# Composer
+- composer install
+
+script:
+# Build
+- mv jorobo.dist.ini jorobo.ini
+- vendor/bin/robo build
+# System tests (Codeception)
+- mv tests/acceptance.suite.dist.yml tests/acceptance.suite.yml
+- vendor/bin/robo run:tests --use-htaccess
+# Run phpcs on PHP 5.6 against weblinks source
+- if [[ $RUN_PHPCS == "yes" ]]; then vendor/bin/phpcs --report=full --extensions=php -p --standard=tests/joomla/build/phpcs/Joomla ./src; fi

README.md

@@ -1,10 +1,12 @@
-# Weblinks for Joomla! Travis:
+# Weblinks for Joomla!
 
-Travis: [![Travis Build Status](https://travis-ci.org/joomla-extensions/weblinks.svg?branch=master)](https://travis-ci.org/joomla-extensions/weblinks) 
+Build Status
+---------------------
+| Drone-CI |
+| ------------- |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla-extensions/weblinks/status.svg)](https://ci.joomla.org/joomla-extensions/weblinks) |
 
-Drone: [![Drone Build Status](http://213.160.72.75/api/badges/joomla-extensions/weblinks/status.svg)](http://213.160.72.75/joomla-extensions/weblinks)
-
-This repo is meant to hold the decoupled com_weblinks component and related code.
+Weblinks for Joomla! provides a component and accompanying extensions to create a directory of weblinks.
 
 # How to test a PR
 
@@ -166,10 +168,10 @@ Bye
 class_name: AcceptanceTester
 modules:
     enabled:
-        - Joomla\Browser\JoomlaBrowser
-        - Helper\Acceptance
+        - JoomlaBrowser
+        - AcceptanceHelper
     config:
-        Joomla\Browser\JoomlaBrowser:
+        JoomlaBrowser:
             url: 'http://localhost/weblinks/tests/joomla-cms3'     # the url that points to the joomla installation at /tests/system/joomla-cms
             browser: 'firefox'
             window_size: 1024x768
@@ -197,12 +199,12 @@ env:
     tablet:
         modules:
             config:
-                Joomla\Browser\JoomlaBrowser:
+                JoomlaBrowser:
                     window_size: 768x1024
     phone:
         modules:
             config:
-                Joomla\Browser\JoomlaBrowser:
+                JoomlaBrowser:
                     window_size: 480x640
 ```
 
@@ -221,7 +223,7 @@ skipClone = false
 cmsPath = tests/joomla-cms3
 
 ; If you want to clone a different branch, you can set it here
-branch = 4.0-dev
+branch = 3.10-dev
 
 ; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here.
 localUser =
@@ -264,7 +266,7 @@ The currently available options are as follows:
 
 * `skipClone`: set to `true` to avoid the cms repo being deleted and re-cloned at each test execution. Useful to save time and bandwidth while you're debugging your test environment. But please be aware that if you don't refresh the repo you'll have to manually check the `installation` folder is present and the `configuration.php` is not.
 * `cmsPath`: set to the local path (absolute or relative) where you'd like the test website to be installed. Default is `tests/joomla-cms3`.
-* `branch`: set to whatever existing branch from the `joomla-cms` project if you want to clone that specific branch. Default is `4.0-dev`.
+* `branch`: set to whatever existing branch from the `joomla-cms` project if you want to clone that specific branch. Default is `3.10-dev`.
 
 ## Additional options
 

RoboFile.dist.ini

@@ -7,7 +7,7 @@ skipClone = false
 cmsPath = tests/joomla
 
 ; If you want to clone a different branch, you can set it here
-branch = 4.0-dev
+branch = 3.10-dev
 
 ; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here.
 localUser = www-data

RoboFile.php

@@ -12,7 +12,8 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-use Joomla\Jorobo\Tasks\Tasks as loadReleaseTasks;
+use Joomla\Jorobo\Tasks\loadTasks as loadReleaseTasks;
+use Joomla\Testing\Robo\Tasks\loadTasks as loadTestingTasks;
 use Robo\Tasks;
 
 require_once 'vendor/autoload.php';
@@ -32,6 +33,7 @@ if (!defined('JPATH_BASE'))
 class RoboFile extends Tasks
 {
 	// Load tasks from composer, see composer.json
+	use loadTestingTasks;
 	use loadReleaseTasks;
 
 	/**
@@ -396,7 +398,7 @@ class RoboFile extends Tasks
 	 */
 	private function buildGitCloneCommand()
 	{
-		$branch = empty($this->configuration->branch) ? '4.0-dev' : $this->configuration->branch;
+		$branch = empty($this->configuration->branch) ? '3.10-dev' : $this->configuration->branch;
 
 		return "git" . $this->executableExtension . " clone -b $branch --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/cache";
 	}
@@ -593,7 +595,7 @@ class RoboFile extends Tasks
 	{
 		$suiteConfig        = $this->getSuiteConfig();
 		$codeceptMainConfig = \Codeception\Configuration::config();
-		$browser            = $suiteConfig['modules']['config']['Joomla\Browser\JoomlaBrowser']['browser'];
+		$browser            = $suiteConfig['modules']['config']['JoomlaBrowser']['browser'];
 
 		if ($browser == 'chrome')
 		{

codeception.yml

@@ -5,9 +5,9 @@ paths:
     data: tests/_data
     helpers: tests/_support
 settings:
+    bootstrap: _bootstrap.php
     colors: true
     memory_limit: 1024M
-bootstrap: _bootstrap.php
 webdrivers:
   firefox:
     windows: vendor\joomla-projects\selenium-server-standalone\bin\webdrivers\gecko\windows\geckodriver64.exe

composer.json

@@ -1,29 +1,25 @@
 {
     "name"       : "joomla-extensions/weblinks",
     "description": "The Open Source PHP Framework for creating complex Joomla extensions",
-    "license"    : "GPL-2.0+",
+    "license"    : "GPL-2.0-or-later",
     "config": {
         "platform": {
-            "php": "7.2.5"
+            "php": "5.6.0"
         }
     },
     "require"    : {
-        "php": ">=7.2.5|~8"
+        "php": "^5.3.10|^7.0"
     },
     "require-dev": {
-        "behat/gherkin": "^4.4.1",
-        "codeception/codeception": "^4.1",
-        "fzaninotto/faker": "^1.6",
-        "joomla-projects/joomla-browser": "^4.0",
-        "joomla-projects/jorobo": "dev-develop",
-        "joomla-projects/selenium-server-standalone": "^3.14",
+        "php": ">=5.6",
+        "codeception/codeception": "^3",
         "phpunit/phpunit": "^5.7.27",
-        "friendsofphp/php-cs-fixer": "^3.4.0",
-        "squizlabs/php_codesniffer": "^3.7.1",
-        "codeception/module-filesystem": "^1.0",
-        "codeception/module-asserts": "^1.3",
-        "phpstan/phpstan": "^1.10",
-        "phan/phan": "^5.4",
-        "phpstan/phpstan-deprecation-rules": "^1.1"
+        "joomla-projects/joomla-browser": "^3.9",
+        "consolidation/robo": "^1.0.0",
+        "joomla-projects/joomla-testing-robo": "~1.0",
+        "joomla-projects/selenium-server-standalone": "^3.14",
+        "fzaninotto/faker": "^1.6",
+        "joomla-projects/jorobo": "~0.7",
+        "behat/gherkin": "^4.4.1"
     }
 }

cypress.config.dist.js

@@ -1,36 +0,0 @@
-const { defineConfig } = require('cypress')
-
-module.exports = defineConfig({
-  fixturesFolder: 'tests/cypress/fixtures',
-  videosFolder: 'tests/cypress/output/videos',
-  screenshotsFolder: 'tests/cypress/output/screenshots',
-  viewportHeight: 1000,
-  viewportWidth: 1200,
-  e2e: {
-    setupNodeEvents(on, config) {},
-    baseUrl: 'http://localhost/',
-    specPattern: [
-      'tests/cypress/integration/install/*.cy.{js,jsx,ts,tsx}',
-      'tests/cypress/integration/administrator/**/*.cy.{js,jsx,ts,tsx}',
-      'tests/cypress/integration/site/**/*.cy.{js,jsx,ts,tsx}'
-    ],
-    supportFile: 'tests/cypress/support/index.js',
-    scrollBehavior: 'center',
-    browser: 'firefox',
-    screenshotOnRunFailure: true,
-    video: false
-  },
-  env: {
-    sitename: 'Joomla CMS Test',
-    name: 'jane doe',
-    email: 'admin@example.com',
-    username: 'ci-admin',
-    password: 'joomla-17082005',
-    db_type: 'MySQLi',
-    db_host: 'localhost',
-    db_name: 'test_joomla',
-    db_user: 'root',
-    db_password: 'joomla_ut',
-    db_prefix: 'jos_',
-  },
-})

jorobo.dist.ini

@@ -1,5 +1,5 @@
 extension = weblinks
-version = 4.0.0
+version = 3.9.0
 source = src
 target = package
 

manifest.xml

@@ -5,12 +5,54 @@
 		<description>Joomla! CMS Weblinks Package</description>
 		<element>pkg_weblinks</element>
 		<type>package</type>
-		<version>3.6.0</version>
+		<version>3.7.0</version>
 		<client>site</client>
-		<infourl title="Weblinks Extension Package">https://github.com/joomla-extensions/weblinks/releases/tag/3.6.0</infourl>
+		<infourl title="Weblinks Extension Package">https://github.com/joomla-extensions/weblinks/releases/tag/3.7.0</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://downloads.joomla.org/extensions/weblinks/3-6-0/pkg-weblinks-3.6.0.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://downloads.joomla.org/extensions/weblinks/3-7-0/pkg-weblinks-3.7.0.zip</downloadurl>
 		</downloads>
-		<targetplatform name="joomla" version="3.[6789]" />
+		<targetplatform name="joomla" version="3.[678]" />
+	</update>
+	<update>
+		<name>Weblinks Extension Package</name>
+		<description>Joomla! CMS Weblinks Package</description>
+		<element>pkg_weblinks</element>
+		<type>package</type>
+		<version>3.9.0</version>
+		<client>site</client>
+		<infourl title="Weblinks Extension Package">https://github.com/joomla-extensions/weblinks/releases/tag/3.9.0</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://downloads.joomla.org/extensions/weblinks/3-9-0/pkg-weblinks-3.9.0.zip</downloadurl>
+		</downloads>
+		<sha512>99baa8a622da239b2a0b84414836c494e68b5ff2d1eba2030fccc9d929645a45f7a2459ce2261846a10922f4b77bc6e0f26d34adc1afffb62e51fe45e8f44b53</sha512>
+		<targetplatform name="joomla" version="((3\.(9|10))|(4\.[01234]))" />
+	</update>
+	<update>
+		<name>Weblinks Extension Package</name>
+		<description>Joomla! CMS Weblinks Package</description>
+		<element>pkg_weblinks</element>
+		<type>package</type>
+		<version>4.0.1</version>
+		<client>site</client>
+		<infourl title="Weblinks Extension Package">https://github.com/joomla-extensions/weblinks/releases/tag/4.0.1</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://downloads.joomla.org/extensions/weblinks/4-0-1/pkg-weblinks-4.0.1.zip</downloadurl>
+		</downloads>
+		<sha512>8e6ac146d9bf907971a25728f4ed6cfad900ab51d1bf33a157f11b42bfcb8b7dfbc6c21c9eeebfe2cf572220db33f73fa29807f3d350220ed4e73b09866dcdad</sha512>
+		<targetplatform name="joomla" version="((4\.[01234])|(5\.0))" />
+	</update>
+	<update>
+		<name>Weblinks Extension Package</name>
+		<description>Joomla! CMS Weblinks Package</description>
+		<element>pkg_weblinks</element>
+		<type>package</type>
+		<version>4.3.1</version>
+		<client>site</client>
+		<infourl title="Weblinks Extension Package">https://github.com/joomla-extensions/weblinks/releases/tag/4.3.1</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://downloads.joomla.org/extensions/weblinks/4-3-1/pkg-weblinks-4.3.1.zip</downloadurl>
+		</downloads>
+		<sha512>cbc02c3a4d915b2a4b69d5b425cb22b93c2dadd72829e1dac8f3cd55c2deb4ab4cb244ca75a956dd335c861daa2a17a769390e7cab90988501c16417afefb72f</sha512>
+		<targetplatform name="joomla" version="((4\.[34])|(5\.[01234]))" />
 	</update>
 </updates>

node_modules/.bin/cypress

@@ -1,12 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../cypress/bin/cypress" "$@"
-else 
-  exec node  "$basedir/../cypress/bin/cypress" "$@"
-fi

package.json

@@ -1,25 +0,0 @@
-{
-  "name": "joomla-weblinks",
-  "version": "4.0.0",
-  "description": "Weblinks extension",
-  "license": "GPL-2.0-or-later",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/joomla-extensions/weblinks.git"
-  },
-  "engines": {
-    "node": ">=16",
-    "npm": ">=8.5.5"
-  },
-  "scripts": {
-    "cypress:install": "cypress install",
-    "cypress:open": "cypress open",
-    "cypress:run": "cypress run"
-  },
-  "dependencies": {
-  },
-  "devDependencies": {
-    "cypress": "^12.7.0",
-    "joomla-cypress": "^0.0.16"
-  }
-}

phpstan.neon

@@ -1,11 +0,0 @@
-includes:
-    - vendor/phpstan/phpstan-deprecation-rules/rules.neon
-parameters:
-  level: 6
-  paths:
-    - src
-  scanDirectories:
-    - joomla/libraries
-    - joomla/administrator/components/com_finder/src/Indexer
-  ignoreErrors:
-  reportUnmatchedIgnoredErrors: false

renovate.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":preserveSemverRanges",
+    ":disableMajorUpdates"
+  ],
+  "versioning": "semver",
+  "dependencyDashboard": true,
+  "lockFileMaintenance": { "enabled": true },
+  "composerIgnorePlatformReqs": ["ext-*", "lib-*"],
+  "rangeStrategy": "update-lockfile",
+  "baseBranches": ["master", "4.0-dev"],
+    "constraints": {
+    "composer": "> 2.3",
+    "npm": "> 8.0"
+  }
+}

ruleset.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Joomla-CMS">
-    <description>The Joomla CMS PSR-12 exceptions.</description>
-
-    <!-- Exclude folders not containing production code -->
-
-    <!-- Exclude 3rd party libraries and Framework code. -->
-    <exclude-pattern type="relative">src/administrator/components/com_weblinks/layouts/*</exclude-pattern>
-
-    <rule ref="PSR12" />
-
-    <!-- temporary extend the line length -->
-    <rule ref="Generic.Files.LineLength">
-        <properties>
-            <property name="lineLimit" value="560"/>
-            <property name="absoluteLineLimit" value="560"/>
-        </properties>
-    </rule>
-
-    <rule ref="PSR1.Classes.ClassDeclaration">
-	    <exclude-pattern type="relative">src/administrator/components/com_weblinks/script\.php</exclude-pattern>
-        <exclude-pattern type="relative">src/administrator/manifests/packages/weblinks/script\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/administrator/components/com_weblinks/helpers/weblinks\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/components/com_weblinks/helpers/icon\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/components/com_weblinks/helpers/route\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
-	    <exclude-pattern type="relative">src/components/com_weblinks/src/Model/CategoriesModel\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/components/com_weblinks/src/Model/CategoryModel\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/components/com_weblinks/src/Model/WeblinkModel\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/administrator/components/com_weblinks/src/Table/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
-        <exclude-pattern type="relative">src/administrator/components/com_weblinks/script\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/administrator/manifests/packages/weblinks/script\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR2.Methods.MethodDeclaration.Underscore">
-        <exclude-pattern type="relative">src/administrator/components/com_weblinks/src/Table/*\.php</exclude-pattern>
-    </rule>
-
-    <rule ref="Squiz.Classes.ValidClassName">
-        <exclude-pattern type="relative">src/administrator/components/com_weblinks/script\.php</exclude-pattern>
-	    <exclude-pattern type="relative">src/administrator/manifests/packages/weblinks/script\.php</exclude-pattern>
-    </rule>
-</ruleset>

src/administrator/components/com_weblinks/access.xml

@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <access component="com_weblinks">
 	<section name="component">
-		<action name="core.admin" title="JACTION_ADMIN" />
-		<action name="core.options" title="JACTION_OPTIONS" />
-		<action name="core.manage" title="JACTION_MANAGE" />
-		<action name="core.create" title="JACTION_CREATE" />
-		<action name="core.delete" title="JACTION_DELETE" />
-		<action name="core.edit" title="JACTION_EDIT" />
-		<action name="core.edit.state" title="JACTION_EDITSTATE" />
-		<action name="core.edit.own" title="JACTION_EDITOWN" />
-		<action name="core.edit.value" title="JACTION_EDITVALUE"  />
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="JACTION_EDITVALUE_COMPONENT_DESC" />
 	</section>
 	<section name="category">
-		<action name="core.create" title="JACTION_CREATE" />
-		<action name="core.delete" title="JACTION_DELETE" />
-		<action name="core.edit" title="JACTION_EDIT" />
-		<action name="core.edit.state" title="JACTION_EDITSTATE" />
-		<action name="core.edit.own" title="JACTION_EDITOWN" />
+		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
 	</section>
 	<section name="fieldgroup">
-		<action name="core.create" title="JACTION_CREATE" />
-		<action name="core.delete" title="JACTION_DELETE" />
-		<action name="core.edit" title="JACTION_EDIT" />
-		<action name="core.edit.state" title="JACTION_EDITSTATE" />
-		<action name="core.edit.own" title="JACTION_EDITOWN" />
-		<action name="core.edit.value" title="JACTION_EDITVALUE" />
+		<action name="core.create" title="JACTION_CREATE" description="COM_FIELDS_GROUP_PERMISSION_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_GROUP_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_GROUP_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC" />
 	</section>
 	<section name="field">
-		<action name="core.delete" title="JACTION_DELETE" />
-		<action name="core.edit" title="JACTION_EDIT"  />
-		<action name="core.edit.state" title="JACTION_EDITSTATE" />
-		<action name="core.edit.value" title="JACTION_EDITVALUE" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_FIELD_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_FIELD_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC" />
 	</section>
 </access>

src/administrator/components/com_weblinks/config.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<inlinehelp button="show"/>
 	<fieldset
 		name="component"
 		label="COM_WEBLINKS_COMPONENT_LABEL"
@@ -10,6 +9,7 @@
 			name="captcha"
 			type="plugins"
 			label="COM_WEBLINKS_FIELD_CAPTCHA_LABEL"
+			description="COM_WEBLINKS_FIELD_CAPTCHA_DESC"
 			default=""
 			folder="captcha"
 			filter="cmd"
@@ -21,10 +21,9 @@
 		<field
 			name="target"
 			type="list"
-			label="COM_WEBLINKS_FIELD_TARGET_LABEL"
-			description="COM_WEBLINKS_FIELD_TARGET_DESC"
 			default="0"
-			validate="options"
+			description="COM_WEBLINKS_FIELD_TARGET_DESC"
+			label="COM_WEBLINKS_FIELD_TARGET_LABEL"
 			>
 			<option value="0">JBROWSERTARGET_PARENT</option>
 			<option value="1">JBROWSERTARGET_NEW</option>
@@ -35,33 +34,35 @@
 		<field
 			name="save_history"
 			type="radio"
-			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="0"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
 			>
-			<option value="0">JNO</option>
 			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
 		<field
 			name="history_limit"
-			type="number"
-			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			type="text"
 			filter="integer"
-			default="10"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			default="5"
 			showon="save_history:1"
 		/>
 
 		<field
 			name="count_clicks"
 			type="radio"
+			class="btn-group btn-group-yesno"
+			default="1"
 			label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
 			description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
-			layout="joomla.form.field.radio.switcher"
-			default="1"
 			>
-			<option value="0">JNO</option>
 			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
 		<field
@@ -88,7 +89,6 @@
 			type="media"
 			description="COM_WEBLINKS_FIELD_CONFIG_ICON_DESC"
 			label="COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL"
-			showon="icons:1"
 		/>
 
 		<field
@@ -101,8 +101,7 @@
 			name="float_first"
 			type="list"
 			label="COM_WEBLINKS_FLOAT_FIRST_LABEL"
-			default="none"
-			validate="options"
+			description="COM_WEBLINKS_FLOAT_FIRST_DESC"
 			>
 			<option value="right">COM_WEBLINKS_RIGHT</option>
 			<option value="left">COM_WEBLINKS_LEFT</option>
@@ -113,8 +112,7 @@
 			name="float_second"
 			type="list"
 			label="COM_WEBLINKS_FLOAT_SECOND_LABEL"
-			default="none"
-			validate="options"
+			description="COM_WEBLINKS_FLOAT_SECOND_DESC"
 			>
 			<option value="right">COM_WEBLINKS_RIGHT</option>
 			<option value="left">COM_WEBLINKS_LEFT</option>
@@ -126,15 +124,18 @@
 			type="spacer"
 			hr="true"
 		/>
+
 		<field
+			id="show_tags"
 			name="show_tags"
 			type="radio"
-			label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
+			label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
+			description="COM_WEBLINKS_FIELD_SHOW_TAGS_DESC"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 	</fieldset>
 
@@ -147,7 +148,7 @@
 			name="category_layout"
 			type="componentlayout"
 			label="JGLOBAL_FIELD_LAYOUT_LABEL"
-			class="form-select"
+			description="JGLOBAL_FIELD_LAYOUT_DESC"
 			menuitems="true"
 			extension="com_weblinks"
 			view="category"
@@ -156,42 +157,45 @@
 		<field
 			name="show_category_title"
 			type="radio"
+			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_CATEGORY_TITLE"
-			layout="joomla.form.field.radio.switcher"
+			description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
 			default="1"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_description"
 			type="radio"
-			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
+			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_description_image"
 			type="radio"
+			class="btn-group btn-group-yesno"
+			default="1"
 			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
-			layout="joomla.form.field.radio.switcher"
-			default="0"
+			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="maxLevel"
 			type="list"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 			default="-1"
-			validate="options"
 			>
 			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
@@ -205,45 +209,49 @@
 		<field
 			name="show_empty_categories"
 			type="radio"
+			class="btn-group btn-group-yesno"
 			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
 			default="0"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_subcat_desc"
 			type="radio"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			class="btn-group btn-group-yesno"
 			default="1"
-			layout="joomla.form.field.radio.switcher"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_cat_num_links"
 			type="radio"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
+			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_cat_tags"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
 			label="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL"
+			description="COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC"
+			class="btn-group btn-group-yesno"
 			default="1"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 	</fieldset>
 
@@ -255,22 +263,23 @@
 		<field
 			name="show_base_description"
 			type="radio"
-			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
+			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+			description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+
 		</field>
 
 		<field
 			name="maxLevelcat"
 			type="list"
-			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 			default="-1"
-			validate="options"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 			>
-			<option value="0">JNONE</option>
 			<option value="-1">JALL</option>
 			<option value="1">J1</option>
 			<option value="2">J2</option>
@@ -282,36 +291,37 @@
 		<field
 			name="show_empty_categories_cat"
 			type="radio"
-			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="0"
-			showon="maxLevelcat:-1,1,2,3,4,5"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_subcat_desc_cat"
 			type="radio"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
-			showon="maxLevelcat:-1,1,2,3,4,5"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_cat_num_links_cat"
 			type="radio"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
+			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 	</fieldset>
 
@@ -322,21 +332,34 @@
 		>
 		<field
 			name="filter_field"
-			type="radio"
-			layout="joomla.form.field.radio.switcher"
+			type="list"
+			default="1"
+			description="JGLOBAL_FILTER_FIELD_DESC"
 			label="JGLOBAL_FILTER_FIELD_LABEL"
-			default="0"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="hide">JHIDE</option>
 		</field>
 
 		<field
 			name="show_pagination_limit"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
-			default="0"
+			default="1"
+			class="btn-group btn-group-yesno"
 			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_headings"
+			type="radio"
+			default="1"
+			class="btn-group btn-group-yesno"
+			description="JGLOBAL_SHOW_HEADINGS_DESC"
+			label="JGLOBAL_SHOW_HEADINGS_LABEL"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -345,23 +368,25 @@
 		<field
 			name="show_link_description"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
 			default="1"
+			class="btn-group btn-group-yesno"
+			description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
 			label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
 			name="show_link_hits"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
+			description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
 			label="JGLOBAL_HITS"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
@@ -369,6 +394,7 @@
 			type="list"
 			default="2"
 			label="JGLOBAL_PAGINATION_LABEL"
+			description="JGLOBAL_PAGINATION_DESC"
 			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
@@ -378,12 +404,13 @@
 		<field
 			name="show_pagination_results"
 			type="radio"
-			layout="joomla.form.field.radio.switcher"
+			class="btn-group btn-group-yesno"
 			default="1"
 			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
 			>
-			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
 		</field>
 	</fieldset>
 
@@ -392,51 +419,29 @@
 		label="JGLOBAL_INTEGRATION_LABEL"
 		description="COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC"
 		>
-		<fieldset
-				name="integration_newsfeeds"
-				label="JGLOBAL_FEED_TITLE"
-		>
-			<field
-					name="show_feed_link"
-					type="radio"
-					layout="joomla.form.field.radio.switcher"
-					label="JGLOBAL_SHOW_FEED_LINK_LABEL"
-					default="1"
+		<field
+			name="show_feed_link"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="1"
+			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			description="JGLOBAL_SHOW_FEED_LINK_DESC"
 			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-		</fieldset>
-		<fieldset
-				name="integration_sef"
-				label="JGLOBAL_SEF_TITLE"
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="custom_fields_enable"
+			type="radio"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
 		>
-			<field
-					name="sef_ids"
-					type="radio"
-					layout="joomla.form.field.radio.switcher"
-					default="0"
-					label="JGLOBAL_SEF_NOIDS_LABEL"
-					filter="integer">
-				<option value="0">JNO</option>
-				<option value="1">JYES</option>
-			</field>
-		</fieldset>
-		<fieldset
-				name="integration_customfields"
-				label="JGLOBAL_FIELDS_TITLE"
-		>
-			<field
-					name="custom_fields_enable"
-					type="radio"
-					layout="joomla.form.field.radio.switcher"
-					label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
-					default="1"
-			>
-				<option value="0">JNO</option>
-				<option value="1">JYES</option>
-			</field>
-		</fieldset>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
 	</fieldset>
 
 	<fieldset

src/administrator/components/com_weblinks/controller.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Weblinks Main Controller
+ *
+ * @since  1.5
+ */
+class WeblinksController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cacheable  If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types,
+	 *                               for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cacheable = false, $urlparams = false)
+	{
+		require_once JPATH_COMPONENT . '/helpers/weblinks.php';
+
+		$view   = $this->input->get('view', 'weblinks');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'weblink' && $layout == 'edit' && !$this->checkEditId('com_weblinks.edit.weblink', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_weblinks&view=weblinks', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}

src/administrator/components/com_weblinks/controllers/weblink.php

@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Weblink controller class.
+ *
+ * @since  1.6
+ */
+class WeblinksControllerWeblink extends JControllerForm
+{
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
+		$allow = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the URL check it.
+			$allow = JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId);
+		}
+
+		if ($allow !== null)
+		{
+			return $allow;
+		}
+
+		// In the absense of better information, revert to the component permissions.
+		return parent::allowAdd($data);
+	}
+
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+		// Since there is no asset tracking, fallback to the component permissions.
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Get the item.
+		$item = $this->getModel()->getItem($recordId);
+
+		// Since there is no item, return false.
+		if (empty($item))
+		{
+			return false;
+		}
+
+		$user = JFactory::getUser();
+
+		// Check if can edit own core.edit.own.
+		$canEditOwn = $user->authorise('core.edit.own', $this->option . '.category.' . (int) $item->catid) && $item->created_by == $user->id;
+
+		// Check the category core.edit permissions.
+		return $canEditOwn || $user->authorise('core.edit', $this->option . '.category.' . (int) $item->catid);
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   1.7
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Weblink', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_weblinks&view=weblinks' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		$task = $this->getTask();
+
+		if ($task == 'save')
+		{
+			$this->setRedirect(JRoute::_('index.php?option=com_weblinks&view=weblinks', false));
+		}
+	}
+}

src/administrator/components/com_weblinks/controllers/weblinks.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Weblinks list controller class.
+ *
+ * @since  1.6
+ */
+class WeblinksControllerWeblinks extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Weblink', $prefix = 'WeblinksModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}

src/administrator/components/com_weblinks/forms/category.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<form>
-	<help key="Components_Weblinks_Categories_Edit" />
-	<listhelp key="Components_Weblinks_Categories" />
-</form>

src/administrator/components/com_weblinks/helpers/associations.php

@@ -0,0 +1,192 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JTable::addIncludePath(__DIR__ . '/../tables');
+
+/**
+ * Content associations helper.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class WeblinksAssociationsHelper extends JAssociationExtensionHelper
+{
+	/**
+	 * The extension name
+	 *
+	 * @var     array   $extension
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $extension = 'com_weblinks';
+
+	/**
+	 * Array of item types
+	 *
+	 * @var     array   $itemTypes
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $itemTypes = array('weblink', 'category');
+
+	/**
+	 * Has the extension association support
+	 *
+	 * @var     boolean   $associationsSupport
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+		$catidField = 'catid';
+
+		if ($typeName === 'category')
+		{
+			$context    = 'com_categories.item';
+			$catidField = '';
+		}
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			$catidField
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'weblink':
+				$table = JTable::getInstance('Weblink', 'WeblinksTable');
+				break;
+
+			case 'category':
+				$table = JTable::getInstance('Category');
+				break;
+		}
+
+		if (empty($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+			switch ($typeName)
+			{
+				case 'weblink':
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['category'] = true;
+					$support['save2copy'] = true;
+
+					$tables = array(
+						'a' => '#__weblinks'
+					);
+
+					$title = 'weblink';
+					break;
+
+				case 'category':
+					$fields['created_user_id'] = 'a.created_user_id';
+					$fields['ordering']        = 'a.lft';
+					$fields['level']           = 'a.level';
+					$fields['catid']           = '';
+					$fields['state']           = 'a.published';
+
+					$support['state']    = true;
+					$support['acl']      = true;
+					$support['checkout'] = true;
+					$support['level'] = true;
+
+					$tables = array(
+						'a' => '#__categories'
+					);
+
+					$title = 'category';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}

src/administrator/components/com_weblinks/helpers/html/weblink.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('WeblinksHelper', JPATH_ADMINISTRATOR . '/components/com_weblinks/helpers/weblinks.php');
+
+/**
+ * Weblink HTML helper class.
+ *
+ * @since  __DELPOY_VERSION__
+ */
+abstract class JHtmlWeblink
+{
+	/**
+	 * Get the associated language flags
+	 *
+	 * @param   integer  $weblinkid  The item id to search associations
+	 *
+	 * @return  string  The language HTML
+	 *
+	 * @throws  Exception
+	 *
+	 * @since   ___DEPLOY_VERSION__
+	 */
+	public static function association($weblinkid)
+	{
+		// Defaults
+		$html = '';
+		$associations = JLanguageAssociations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $weblinkid);
+
+		// Get the associations
+		if ($associations)
+		{
+			foreach ($associations as $tag => $associated)
+			{
+				$associations[$tag] = (int) $associated->id;
+			}
+
+			// Get the associated weblinks items
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('c.id, c.title as title')
+				->select('l.sef as lang_sef, lang_code')
+				->from('#__weblinks as c')
+				->select('cat.title as category_title')
+				->join('LEFT', '#__categories as cat ON cat.id=c.catid')
+				->where('c.id IN (' . implode(',', array_values($associations)) . ')')
+				->join('LEFT', '#__languages as l ON c.language=l.lang_code')
+				->select('l.image')
+				->select('l.title as language_title');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadObjectList('id');
+			}
+			catch (RuntimeException $e)
+			{
+				throw new Exception($e->getMessage(), 500, $e);
+			}
+
+			if ($items)
+			{
+				foreach ($items as &$item)
+				{
+					$text = strtoupper($item->lang_sef);
+					$url  = JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id);
+
+					$tooltip = htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br />' . JText::sprintf('JCATEGORY_SPRINTF', $item->category_title);
+					$classes = 'hasPopover label label-association label-' . $item->lang_sef;
+
+					$item->link = '<a href="' . $url . '" title="' . $item->language_title . '" class="' . $classes
+						. '" data-content="' . $tooltip . '" data-placement="top">'
+						. $text . '</a>';
+				}
+			}
+
+			JHtml::_('bootstrap.popover');
+
+			$html = JLayoutHelper::render('joomla.content.associations', $items);
+		}
+
+		return $html;
+	}
+}

src/administrator/components/com_weblinks/helpers/weblinks.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  Weblinks
@@ -8,15 +7,163 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
+defined('_JEXEC') or die;
 
 /**
  * Weblinks helper.
  *
  * @since  1.6
  */
-class WeblinksHelper extends \Joomla\Component\Weblinks\Administrator\Helper\WeblinksHelper
+class WeblinksHelper extends JHelperContent
 {
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName = 'weblinks')
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_WEBLINKS_SUBMENU_WEBLINKS'),
+			'index.php?option=com_weblinks&view=weblinks',
+			$vName == 'weblinks'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_WEBLINKS_SUBMENU_CATEGORIES'),
+			'index.php?option=com_categories&extension=com_weblinks',
+			$vName == 'categories'
+		);
+
+		if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_weblinks')->get('custom_fields_enable', '1'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_weblinks.weblink',
+				$vName == 'fields.fields'
+			);
+
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_fields&view=groups&context=com_weblinks.weblink',
+				$vName == 'fields.groups'
+			);
+		}
+	}
+
+	/**
+	 * Adds Count Items for WebLinks Category Manager.
+	 *
+	 * @param   stdClass[]  &$items  The weblinks category objects.
+	 *
+	 * @return  stdClass[]  The weblinks category objects.
+	 *
+	 * @since   3.6.0
+	 */
+	public static function countItems(&$items)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed     = 0;
+			$item->count_archived    = 0;
+			$item->count_unpublished = 0;
+			$item->count_published   = 0;
+
+			$query = $db->getQuery(true)
+				->select('state, COUNT(*) AS count')
+				->from($db->qn('#__weblinks'))
+				->where($db->qn('catid') . ' = ' . (int) $item->id)
+				->group('state');
+
+			$db->setQuery($query);
+			$weblinks = $db->loadObjectList();
+
+			foreach ($weblinks as $weblink)
+			{
+				if ($weblink->state == 1)
+				{
+					$item->count_published = $weblink->count;
+				}
+				elseif ($weblink->state == 0)
+				{
+					$item->count_unpublished = $weblink->count;
+				}
+				elseif ($weblink->state == 2)
+				{
+					$item->count_archived = $weblink->count;
+				}
+				elseif ($weblink->state == -2)
+				{
+					$item->count_trashed = $weblink->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Adds Count Items for Tag Manager.
+	 *
+	 * @param   stdClass[]  &$items     The weblink tag objects
+	 * @param   string      $extension  The name of the active view.
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.7.0
+	 */
+	public static function countTagItems(&$items, $extension)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+
+			$query = $db->getQuery(true);
+			$query->select('published as state, count(*) AS count')
+				->from($db->qn('#__contentitem_tag_map') . 'AS ct ')
+				->where('ct.tag_id = ' . (int) $item->id)
+				->where('ct.type_alias =' . $db->q($extension))
+				->join('LEFT', $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id')
+				->group('state');
+
+			$db->setQuery($query);
+			$weblinks = $db->loadObjectList();
+
+			foreach ($weblinks as $weblink)
+			{
+				if ($weblink->state == 1)
+				{
+					$item->count_published = $weblink->count;
+				}
+
+				if ($weblink->state == 0)
+				{
+					$item->count_unpublished = $weblink->count;
+				}
+
+				if ($weblink->state == 2)
+				{
+					$item->count_archived = $weblink->count;
+				}
+
+				if ($weblink->state == -2)
+				{
+					$item->count_trashed = $weblink->count;
+				}
+			}
+		}
+
+		return $items;
+	}
 }

src/administrator/components/com_weblinks/models/fields/modal/weblink.php

@@ -0,0 +1,266 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('JPATH_BASE') or die;
+/**
+ * Supports a modal weblink picker.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JFormFieldModal_Weblink extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $type = 'Modal_Weblink';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getInput()
+	{
+		$allowNew    = ((string) $this->element['new'] == 'true');
+		$allowEdit   = ((string) $this->element['edit'] == 'true');
+		$allowClear  = ((string) $this->element['clear'] != 'false');
+		$allowSelect = ((string) $this->element['select'] != 'false');
+
+		// Load language
+		JFactory::getLanguage()->load('com_weblinks', JPATH_ADMINISTRATOR);
+
+		// The active weblink id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Create the modal id.
+		$modalId = 'Weblink_' . $this->id;
+
+		// Add the modal field script to the document head.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/modal-fields.js', array('version' => 'auto', 'relative' => true));
+
+		// Script to proxy the select modal function to the modal-fields.js file.
+		if ($allowSelect)
+		{
+			static $scriptSelect = null;
+
+			if (is_null($scriptSelect))
+			{
+				$scriptSelect = array();
+			}
+
+			if (!isset($scriptSelect[$this->id]))
+			{
+				JFactory::getDocument()->addScriptDeclaration("
+				function jSelectWeblink_" . $this->id . "(id, title, catid, object, url, language) {
+					window.processModalSelect('Weblink', '" . $this->id . "', id, title, catid, object, url, language);
+				}
+				"
+				);
+				$scriptSelect[$this->id] = true;
+			}
+		}
+
+		// Setup variables for display.
+		$linkWeblinks = 'index.php?option=com_weblinks&amp;view=weblinks&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$linkWeblink  = 'index.php?option=com_weblinks&amp;view=weblink&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$modalTitle   = JText::_('COM_WEBLINKS_CHANGE_WEBLINK');
+
+		if (isset($this->element['language']))
+		{
+			$linkWeblinks .= '&amp;forcedLanguage=' . $this->element['language'];
+			$linkWeblink  .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle   .= ' &#8212; ' . $this->element['label'];
+		}
+
+		$urlSelect = $linkWeblinks . '&amp;function=jSelectWeblink_' . $this->id;
+		$urlEdit   = $linkWeblink . '&amp;task=weblink.edit&amp;id=\' + document.getElementById("' . $this->id . '_id").value + \'';
+		$urlNew    = $linkWeblink . '&amp;task=weblink.add';
+
+		if ($value)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__weblinks'))
+				->where($db->quoteName('id') . ' = ' . (int) $value);
+			$db->setQuery($query);
+
+			try
+			{
+				$title = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+			}
+		}
+
+		$title = empty($title) ? JText::_('COM_WEBLINKS_SELECT_A_WEBLINK') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The current weblink display field.
+		$html  = '<span class="input-append">';
+		$html .= '<input class="input-medium" id="' . $this->id . '_name" type="text" value="' . $title . '" disabled="disabled" size="35" />';
+
+		// Select weblink button
+		if ($allowSelect)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_select"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalSelect' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_WEBLINKS_CHANGE_WEBLINK') . '">'
+				. '<span class="icon-file" aria-hidden="true"></span> ' . JText::_('JSELECT')
+				. '</a>';
+		}
+
+		// New weblink button
+		if ($allowNew)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_new"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalNew' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_WEBLINKS_NEW_WEBLINK') . '">'
+				. '<span class="icon-new" aria-hidden="true"></span> ' . JText::_('JACTION_CREATE')
+				. '</a>';
+		}
+
+		// Edit weblink button
+		if ($allowEdit)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_edit"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalEdit' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_WEBLINKS_EDIT_WEBLINK') . '">'
+				. '<span class="icon-edit" aria-hidden="true"></span> ' . JText::_('JACTION_EDIT')
+				. '</a>';
+		}
+
+		// Clear weblink button
+		if ($allowClear)
+		{
+			$html .= '<a'
+				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_clear"'
+				. ' href="#"'
+				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
+				. '<span class="icon-remove" aria-hidden="true"></span>' . JText::_('JCLEAR')
+				. '</a>';
+		}
+
+		$html .= '</span>';
+
+		// Select weblink modal
+		if ($allowSelect)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalSelect' . $modalId,
+				array(
+					'title'       => $modalTitle,
+					'url'         => $urlSelect,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+				)
+			);
+		}
+
+		// New weblink modal
+		if ($allowNew)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalNew' . $modalId,
+				array(
+					'title'       => JText::_('COM_WEBLINKS_NEW_WEBLINK'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlNew,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'weblink\', \'cancel\', \'weblink-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'weblink\', \'save\', \'weblink-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'weblink\', \'apply\', \'weblink-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Edit weblink modal
+		if ($allowEdit)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalEdit' . $modalId,
+				array(
+					'title'       => JText::_('COM_WEBLINKS_EDIT_WEBLINK'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlEdit,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'weblink\', \'cancel\', \'weblink-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'weblink\', \'save\', \'weblink-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'weblink\', \'apply\', \'weblink-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Note: class='required' for client side validation.
+		$class = $this->required ? ' class="required modal-value"' : '';
+		$html .= '<input type="hidden" id="' . $this->id . '_id" ' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
+			. '" data-text="' . htmlspecialchars(JText::_('COM_WEBLINKS_SELECT_A_WEBLINK', true), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '" />';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getLabel()
+	{
+		return str_replace($this->id, $this->id . '_id', parent::getLabel());
+	}
+}

src/administrator/components/com_weblinks/models/forms/filter_weblinks.xml

@@ -12,6 +12,7 @@
 			name="published"
 			type="status"
 			label="JOPTION_FILTER_PUBLISHED"
+			description="JOPTION_FILTER_PUBLISHED_DESC"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
@@ -20,6 +21,7 @@
 			name="category_id"
 			type="category"
 			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
 			extension="com_weblinks"
 			onchange="this.form.submit();"
 			>
@@ -29,6 +31,7 @@
 			name="access"
 			type="accesslevel"
 			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
@@ -37,6 +40,7 @@
 			name="language"
 			type="contentlanguage"
 			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
@@ -46,6 +50,7 @@
 			name="tag"
 			type="tag"
 			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
 			mode="nested"
 			onchange="this.form.submit();"
 			>
@@ -55,6 +60,7 @@
 			name="level"
 			type="integer"
 			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
 			first="1"
 			last="10"
 			step="1"

src/administrator/components/com_weblinks/models/forms/weblink.xml

@@ -7,6 +7,7 @@
 			name="id"
 			type="text"
 			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
 			readonly="true"
 			class="readonly"
 			default="0"
@@ -16,15 +17,18 @@
 			name="title"
 			type="text"
 			label="JGLOBAL_TITLE"
+			description="COM_WEBLINKS_FIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
 			required="true"
-			maxlength="250"
 		/>
 
 		<field
 			name="alias"
 			type="text"
 			label="JFIELD_ALIAS_LABEL"
-			description="JFIELD_ALIAS_DESC"
+			description="COM_WEBLINKS_FIELD_ALIAS_DESC"
+			size="40"
 			hint="JFIELD_ALIAS_PLACEHOLDER"
 		/>
 
@@ -32,6 +36,7 @@
 			name="catid"
 			type="categoryedit"
 			label="JCATEGORY"
+			description="COM_WEBLINKS_FIELD_CATEGORY_DESC"
 			extension="com_weblinks"
 			addfieldprefix="Joomla\Component\Categories\Administrator\Field"
 			required="true"
@@ -42,8 +47,10 @@
 			name="url"
 			type="url"
 			label="COM_WEBLINKS_FIELD_URL_LABEL"
+			description="COM_WEBLINKS_FIELD_URL_DESC"
+			class="span12"
 			filter="url"
-			validate="url"
+			size="40"
 			required="true"
 		/>
 
@@ -51,28 +58,31 @@
 			name="description"
 			type="editor"
 			label="JGLOBAL_DESCRIPTION"
+			description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
+			filter="JComponentHelper::filterText"
 		/>
 
 		<field
 			name="hits"
 			type="text"
 			label="JGLOBAL_HITS"
+			description="COM_WEBLINKS_HITS_DESC"
 			class="readonly"
+			size="6"
 			readonly="true"
 			filter="unset"
-			default="0"
 		/>
 
 		<field
 			name="state"
 			type="list"
 			label="JSTATUS"
-			class="form-select-color-state"
+			description="COM_WEBLINKS_FIELD_STATE_DESC"
+			class="chzn-color-state"
+			size="1"
 			default="1"
-			validate="options"
 			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
@@ -85,6 +95,7 @@
 			name="ordering"
 			type="ordering"
 			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
 			content_type="com_weblinks.weblink"
 		/>
 
@@ -92,14 +103,15 @@
 			name="access"
 			type="accesslevel"
 			label="JFIELD_ACCESS_LABEL"
-			filter="UINT"
-			validate="options"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
 		/>
 
 		<field
 			name="language"
 			type="contentlanguage"
 			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_WEBLINKS_FIELD_LANGUAGE_DESC"
 			>
 			<option value="*">JALL</option>
 		</field>
@@ -108,7 +120,7 @@
 			name="tags"
 			type="tag"
 			label="JTAG"
-			class="advancedSelect"
+			description="JTAG_DESC"
 			multiple="true"
 		/>
 
@@ -116,15 +128,18 @@
 			name="version_note"
 			type="text"
 			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
-			maxlength="250"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			size="45"
+			labelclass="control-label"
 		/>
 
 		<field
 			name="created"
 			type="calendar"
 			label="JGLOBAL_FIELD_CREATED_LABEL"
-			translateformat="true"
-			showtime="true"
+			description="JGLOBAL_FIELD_CREATED_DESC"
+			size="22"
+			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
 
@@ -132,23 +147,26 @@
 			name="created_by"
 			type="user"
 			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
-			validate="UserId"
+			description="JGLOBAL_FIELD_CREATED_BY_Desc"
 		/>
 
 		<field
 			name="created_by_alias"
 			type="text"
 			label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20"
 		/>
 
 		<field
 			name="modified"
 			type="calendar"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			description="COM_WEBLINKS_FIELD_MODIFIED_DESC"
 			class="readonly"
+			size="22"
 			readonly="true"
-			translateformat="true"
-			showtime="true"
+			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
 
@@ -159,7 +177,6 @@
 			class="readonly"
 			readonly="true"
 			filter="unset"
-			validate="UserId"
 		/>
 
 		<field
@@ -178,8 +195,9 @@
 			name="publish_up"
 			type="calendar"
 			label="JGLOBAL_FIELD_PUBLISH_UP_LABEL"
-			translateformat="true"
-			showtime="true"
+			description="JGLOBAL_FIELD_PUBLISH_UP_DESC"
+			format="%Y-%m-%d %H:%M:%S"
+			size="22"
 			filter="user_utc"
 		/>
 
@@ -187,8 +205,9 @@
 			name="publish_down"
 			type="calendar"
 			label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL"
-			translateformat="true"
-			showtime="true"
+			description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
+			format="%Y-%m-%d %H:%M:%S"
+			size="22"
 			filter="user_utc"
 		/>
 
@@ -196,7 +215,9 @@
 			name="version"
 			type="text"
 			label="COM_WEBLINKS_FIELD_VERSION_LABEL"
+			description="COM_WEBLINKS_FIELD_VERSION_DESC"
 			class="readonly"
+			size="6"
 			readonly="true"
 			filter="unset"
 		/>
@@ -205,6 +226,7 @@
 			name="metakey"
 			type="textarea"
 			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
 			rows="3"
 			cols="30"
 		/>
@@ -213,16 +235,17 @@
 			name="metadesc"
 			type="textarea"
 			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
 			rows="3"
 			cols="30"
-			maxlength="160"
-			charcounter="true"
 		/>
 
 		<field
 			name="xreference"
 			type="text"
 			label="JFIELD_XREFERENCE_LABEL"
+			description="JFIELD_XREFERENCE_DESC"
+			size="20"
 		/>
 	</fieldset>
 
@@ -238,6 +261,7 @@
 				name="target"
 				type="list"
 				label="COM_WEBLINKS_FIELD_TARGET_LABEL"
+				description="COM_WEBLINKS_FIELD_TARGET_DESC"
 				default=""
 				useglobal="true"
 				>
@@ -251,6 +275,7 @@
 				name="width"
 				type="text"
 				label="COM_WEBLINKS_FIELD_WIDTH_LABEL"
+				description="COM_WEBLINKS_FIELD_WIDTH_DESC"
 				class="validate-numeric"
 			/>
 
@@ -258,6 +283,7 @@
 				name="height"
 				type="text"
 				label="COM_WEBLINKS_FIELD_HEIGHT_LABEL"
+				description="COM_WEBLINKS_FIELD_HEIGHT_DESC"
 				class="validate-numeric"
 			/>
 
@@ -265,6 +291,8 @@
 				name="count_clicks"
 				type="list"
 				label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
+				description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option value="0">JNO</option>
@@ -284,12 +312,14 @@
 				name="image_first"
 				type="media"
 				label="COM_WEBLINKS_FIELD_FIRST_LABEL"
+				description="COM_WEBLINKS_FIELD_FIRST_DESC"
 			/>
 
 			<field
 				name="float_first"
 				type="list"
 				label="COM_WEBLINKS_FLOAT_FIRST_LABEL"
+				description="COM_WEBLINKS_FLOAT_FIRST_DESC"
 				useglobal="true"
 				>
 				<option value="right">COM_WEBLINKS_RIGHT</option>
@@ -301,19 +331,16 @@
 				name="image_first_alt"
 				type="text"
 				label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
-			/>
-
-			<field
-				name="image_first_alt_empty"
-				type="checkbox"
-				label="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL"
-				description="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC"
+				description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC"
+				size="20"
 			/>
 
 			<field
 				name="image_first_caption"
 				type="text"
 				label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC"
+				size="20"
 			/>
 
 			<field
@@ -326,14 +353,16 @@
 				name="image_second"
 				type="media"
 				label="COM_WEBLINKS_FIELD_SECOND_LABEL"
+				description="COM_WEBLINKS_FIELD_SECOND_DESC"
 			/>
 
 			<field
 				name="float_second"
 				type="list"
 				label="COM_WEBLINKS_FLOAT_SECOND_LABEL"
-				useglobal="true"
+				description="COM_WEBLINKS_FLOAT_SECOND_DESC"
 				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="right">COM_WEBLINKS_RIGHT</option>
 				<option value="left">COM_WEBLINKS_LEFT</option>
 				<option value="none">COM_WEBLINKS_NONE</option>
@@ -343,19 +372,16 @@
 				name="image_second_alt"
 				type="text"
 				label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
-			/>
-
-			<field
-				name="image_second_alt_empty"
-				type="checkbox"
-				label="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL"
-				description="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC"
+				description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC"
+				size="20"
 			/>
 
 			<field
 				name="image_second_caption"
 				type="text"
 				label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC"
+				size="20"
 			/>
 		</fieldset>
 	</fields>
@@ -372,19 +398,24 @@
 				name="robots"
 				type="list"
 				label="JFIELD_METADATA_ROBOTS_LABEL"
-				validate="options"
+				description="JFIELD_METADATA_ROBOTS_DESC"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
-				<option value="index, follow" />
-				<option value="noindex, follow" />
-				<option value="index, nofollow" />
-				<option value="noindex, nofollow" />
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
 			</field>
 
 			<field
 				name="rights"
 				type="text"
 				label="JFIELD_META_RIGHTS_LABEL"
+				description="JFIELD_META_RIGHTS_DESC"
+				required="false"
+				filter="string"
+				cols="30"
+				rows="2"
 			/>
 		</fieldset>
 	</fields>

src/administrator/components/com_weblinks/models/weblink.php

@@ -0,0 +1,458 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('WeblinksHelper', JPATH_ADMINISTRATOR . '/components/com_weblinks/helpers/weblinks.php');
+
+/**
+ * Weblinks model.
+ *
+ * @since  1.5
+ */
+class WeblinksModelWeblink extends JModelAdmin
+{
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $typeAlias = 'com_weblinks.weblink';
+
+	/**
+	 * The context used for the associations table
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $associationsContext = 'com_weblinks.item';
+
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_WEBLINKS';
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission for the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->state != -2)
+			{
+				return;
+			}
+
+			if ($record->catid)
+			{
+				return JFactory::getUser()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid);
+			}
+
+			return parent::canDelete($record);
+		}
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		if (!empty($record->catid))
+		{
+			return JFactory::getUser()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid);
+		}
+
+		return parent::canEditState($record);
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $type    The table name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Weblink', $prefix = 'WeblinksTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Abstract method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_weblinks.weblink', 'weblink', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Determine correct permissions to check.
+		if ($this->getState('weblink.id'))
+		{
+			// Existing record. Can only edit in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.edit');
+		}
+		else
+		{
+			// New record. Can only create in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.create');
+		}
+
+		// Modify the form based on access controls.
+		if (!$this->canEditState((object) $data))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('state', 'disabled', 'true');
+			$form->setFieldAttribute('publish_up', 'disabled', 'true');
+			$form->setFieldAttribute('publish_down', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('state', 'filter', 'unset');
+			$form->setFieldAttribute('publish_up', 'filter', 'unset');
+			$form->setFieldAttribute('publish_down', 'filter', 'unset');
+		}
+
+		// Don't allow to change the created_by user if not allowed to access com_users.
+		if (!JFactory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			$form->setFieldAttribute('created_by', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array  The default data is an empty array.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_weblinks.edit.weblink.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Prime some default values.
+			if ($this->getState('weblink.id') == 0)
+			{
+				$app = JFactory::getApplication();
+				$data->set('catid', $app->input->get('catid', $app->getUserState('com_weblinks.weblinks.filter.category_id'), 'int'));
+			}
+		}
+
+		$this->preprocessData('com_weblinks.weblink', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Convert the metadata field to an array.
+			$registry = new Registry;
+			$registry->loadString($item->metadata);
+			$item->metadata = $registry->toArray();
+
+			// Convert the images field to an array.
+			$registry = new Registry;
+			$registry->loadString($item->images);
+			$item->images = $registry->toArray();
+
+			// Load associated web links items
+			$assoc = JLanguageAssociations::isEnabled();
+
+			if ($assoc)
+			{
+				$item->associations = array();
+
+				if ($item->id != null)
+				{
+					$associations = JLanguageAssociations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $item->id);
+
+					foreach ($associations as $tag => $association)
+					{
+						$item->associations[$tag] = $association->id;
+					}
+				}
+			}
+
+			if (!empty($item->id))
+			{
+				$item->tags = new JHelperTags;
+				$item->tags->getTagIds($item->id, 'com_weblinks.weblink');
+				$item->metadata['tags'] = $item->tags;
+			}
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Prepare and sanitise the table data prior to saving.
+	 *
+	 * @param   JTable  $table  A reference to a JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		$table->title = htmlspecialchars_decode($table->title, ENT_QUOTES);
+		$table->alias = JApplicationHelper::stringURLSafe($table->alias);
+
+		if (empty($table->alias))
+		{
+			$table->alias = JApplicationHelper::stringURLSafe($table->title);
+		}
+
+		if (empty($table->id))
+		{
+			// Set the values
+
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from($db->quoteName('#__weblinks'));
+
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+			else
+			{
+				// Set the values
+				$table->modified    = $date->toSql();
+				$table->modified_by = $user->id;
+			}
+		}
+
+		// Increment the weblink version number.
+		$table->version++;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  array  An array of conditions to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		$condition = array();
+		$condition[] = 'catid = ' . (int) $table->catid;
+
+		return $condition;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since	3.1
+	 */
+	public function save($data)
+	{
+		$app = JFactory::getApplication();
+
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+		// Cast catid to integer for comparison
+		$catid = (int) $data['catid'];
+
+		// Check if New Category exists
+		if ($catid > 0)
+		{
+			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_weblinks');
+		}
+
+		// Save New Category
+		if ($catid == 0 && $this->canCreateCategory())
+		{
+			$table = array();
+			$table['title'] = $data['catid'];
+			$table['parent_id'] = 1;
+			$table['extension'] = 'com_weblinks';
+			$table['language'] = $data['language'];
+			$table['published'] = 1;
+
+			// Create new category and get catid back
+			$data['catid'] = CategoriesHelper::createCategory($table);
+		}
+
+		// Alter the title for save as copy
+		if ($app->input->get('task') == 'save2copy')
+		{
+			list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']);
+			$data['title']	= $name;
+			$data['alias']	= $alias;
+			$data['state']	= 0;
+		}
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Method to change the title & alias.
+	 *
+	 * @param   integer  $category_id  The id of the parent.
+	 * @param   string   $alias        The alias.
+	 * @param   string   $name         The title.
+	 *
+	 * @return  array  Contains the modified title and alias.
+	 *
+	 * @since   3.1
+	 */
+	protected function generateNewTitle($category_id, $alias, $name)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('alias' => $alias, 'catid' => $category_id)))
+		{
+			if ($name == $table->title)
+			{
+				$name = JString::increment($name);
+			}
+
+			$alias = JString::increment($alias, 'dash');
+		}
+
+		return array($name, $alias);
+	}
+
+	/**
+	 * Allows preprocessing of the JForm object.
+	 *
+	 * @param   JForm   $form   The form object
+	 * @param   array   $data   The data to be merged into the form object
+	 * @param   string  $group  The plugin group to be executed
+	 *
+	 * @return  void
+	 *
+	 * @since    3.6.0
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		if ($this->canCreateCategory())
+		{
+			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+		}
+
+		// Association weblinks items
+		if (JLanguageAssociations::isEnabled())
+		{
+			$languages = JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc');
+
+			if (count($languages) > 1)
+			{
+				$addform = new SimpleXMLElement('<form />');
+				$fields = $addform->addChild('fields');
+				$fields->addAttribute('name', 'associations');
+				$fieldset = $fields->addChild('fieldset');
+				$fieldset->addAttribute('name', 'item_associations');
+
+				foreach ($languages as $language)
+				{
+					$field = $fieldset->addChild('field');
+					$field->addAttribute('name', $language->lang_code);
+					$field->addAttribute('type', 'modal_weblink');
+					$field->addAttribute('language', $language->lang_code);
+					$field->addAttribute('label', $language->title);
+					$field->addAttribute('translate_label', 'false');
+					$field->addAttribute('select', 'true');
+					$field->addAttribute('new', 'true');
+					$field->addAttribute('edit', 'true');
+					$field->addAttribute('clear', 'true');
+				}
+
+				$form->load($addform, false);
+			}
+		}
+
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Is the user allowed to create an on the fly category?
+	 *
+	 * @return  bool
+	 *
+	 * @since   3.6.0
+	 */
+	private function canCreateCategory()
+	{
+		return JFactory::getUser()->authorise('core.create', 'com_weblinks');
+	}
+}

src/administrator/components/com_weblinks/models/weblinks.php

@@ -0,0 +1,285 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of weblink records.
+ *
+ * @since  1.6
+ */
+class WeblinksModelWeblinks extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_id',
+				'c.title', 'category_title',
+				'state', 'a.state', 'published',
+				'access', 'a.access',
+				'ag.title', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language',
+				'l.title', 'language_title',
+				'hits', 'a.hits',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'url', 'a.url',
+				'tag',
+				'level', 'c.level',
+			);
+
+			$assoc = JLanguageAssociations::isEnabled();
+
+			if ($assoc)
+			{
+				$config['filter_fields'][] = 'association';
+			}
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @note    Calling getState in this method will result in recursion.
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.title', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
+		$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+		$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
+		$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
+		$this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_weblinks');
+		$this->setState('params', $params);
+
+		// Force a language.
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('filter.language', $forcedLanguage);
+		}
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.category_id');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.tag');
+		$id .= ':' . $this->getState('filter.level');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.created, a.created_by, ' .
+				'a.hits, a.state, a.access, a.ordering, a.language, a.publish_up, a.publish_down'
+			)
+		);
+		$query->from($db->quoteName('#__weblinks', 'a'));
+
+		// Join over the language
+		$query->select($db->quoteName('l.title', 'language_title'))
+			->select($db->quoteName('l.image', 'language_image'))
+			->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->qn('l.lang_code') . ' = ' . $db->qn('a.language'));
+
+		// Join over the users for the checked out user.
+		$query->select($db->quoteName('uc.name', 'editor'))
+			->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->qn('uc.id') . ' = ' . $db->qn('a.checked_out'));
+
+		// Join over the asset groups.
+		$query->select($db->quoteName('ag.title', 'access_level'))
+			->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->qn('ag.id') . ' = ' . $db->qn('a.access'));
+
+		// Join over the categories.
+		$query->select('c.title AS category_title')
+			->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn('a.catid'));
+
+		// Join over the associations.
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			$query->select('COUNT(asso2.id)>1 AS association')
+				->join('LEFT', $db->quoteName('#__associations', 'asso') . ' ON asso.id = a.id AND asso.context = ' . $db->quote('com_weblinks.item'))
+				->join('LEFT', $db->quoteName('#__associations', 'asso2') . ' ON asso2.key = asso.key')
+				->group('a.id, l.title, l.image, uc.name, ag.title, c.title');
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where($db->quoteName('a.access') . ' = ' . (int) $access);
+		}
+
+		// Implement View Level Access
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where($db->quoteName('a.access') . ' IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where($db->quoteName('a.state') . ' = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(' . $db->quoteName('a.state') . ' IN (0, 1))');
+		}
+
+		// Filter by category.
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$query->where($db->quoteName('a.catid') . ' = ' . (int) $categoryId);
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where($db->quoteName('c.level') . ' <= ' . (int) $level);
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(' . $db->quoteName('a.title') . ' LIKE ' . $search . ' OR ' . $db->quoteName('a.alias') . ' LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where($db->quoteName('a.language') . ' = ' . $db->quote($language));
+		}
+
+		$tagId = $this->getState('filter.tag');
+
+		// Filter by a single tag.
+		if (is_numeric($tagId))
+		{
+			$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId)
+				->join(
+					'LEFT', $db->quoteName('#__contentitem_tag_map', 'tagmap')
+					. ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
+					. ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_weblinks.weblink')
+				);
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering', 'a.title');
+		$orderDirn = $this->state->get('list.direction', 'ASC');
+
+		if ($orderCol == 'a.ordering' || $orderCol == 'category_title')
+		{
+			$orderCol = 'c.title ' . $orderDirn . ', a.ordering';
+		}
+
+		$query->order($db->escape($orderCol . ' ' . $orderDirn));
+
+		return $query;
+	}
+}

src/administrator/components/com_weblinks/script.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  Weblinks
@@ -8,16 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Installer\InstallerAdapter;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Table\Table;
+defined('_JEXEC') or die;
 
 /**
  * Installation class to perform additional changes during install/uninstall/update
@@ -26,240 +16,196 @@ use Joomla\CMS\Table\Table;
  */
 class Com_WeblinksInstallerScript
 {
-    /**
-     * Function called before extension installation/update/removal procedure commences
-     *
-     * @param   string            $type    The type of change (install, update or discover_install, not uninstall)
-     * @param   InstallerAdapter  $parent  The class calling this method
-     *
-     * @return  boolean  True on success
-     *
-     * @since   4.0
-     */
-    public function preflight($type, $parent)
-    {
-        $files = [
-            '/administrator/components/com_weblinks/helpers/associations.php',
-            '/administrator/components/com_weblinks/sql/install.sqlsrv.sql',
-            '/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql',
-            '/administrator/language/en-GB/en-GB.com_weblinks.ini',
-            '/administrator/language/en-GB/en-GB.com_weblinks.sys.ini',
-            '/components/com_weblinks/helpers/association.php',
-            '/components/com_weblinks/helpers/category.php',
-            '/language/en-GB/en-GB.com_weblinks.ini',
-            '/language/en-GB/en-GB.mod_weblinks.ini',
-            '/language/en-GB/en-GB.mod_weblinks.sys.ini',
-            '/language/en-GB/en-GB.pkg_weblinks.sys.ini',
-            '/modules/mod_weblinks/helper.php',
-            '/modules/mod_weblinks/mod_weblinks.php',
-            '/plugins/search/weblinks/weblinks.php',
-            '/plugins/finder/weblinks/weblinks.php',
-            '/plugins/editors-xtd/weblink/weblink.php',
-            'plugins/system/weblinks/weblinks.php',
-        ];
+	/**
+	 * Function to perform changes during install
+	 *
+	 * @param   JInstallerAdapterComponent  $parent  The class calling this method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function install($parent)
+	{
+		// Initialize a new category
+		/** @type  JTableCategory  $category  */
+		$category = JTable::getInstance('Category');
 
-        $folders = [
-            '/administrator/components/com_weblinks/helpers/html',
-            '/administrator/components/com_weblinks/sql/updates/sqlsrv',
-        ];
+		// Check if the Uncategorised category exists before adding it
+		if (!$category->load(array('extension' => 'com_weblinks', 'title' => 'Uncategorised')))
+		{
+			$category->extension = 'com_weblinks';
+			$category->title = 'Uncategorised';
+			$category->description = '';
+			$category->published = 1;
+			$category->access = 1;
+			$category->params = '{"category_layout":"","image":""}';
+			$category->metadata = '{"author":"","robots":""}';
+			$category->metadesc = '';
+			$category->metakey = '';
+			$category->language = '*';
+			$category->checked_out_time = JFactory::getDbo()->getNullDate();
+			$category->version = 1;
+			$category->hits = 0;
+			$category->modified_user_id = 0;
+			$category->checked_out = 0;
 
-        foreach ($files as $file) {
-            if (File::exists(JPATH_ROOT . $file)) {
-                File::delete(JPATH_ROOT . $file);
-            }
-        }
+			// Set the location in the tree
+			$category->setLocation(1, 'last-child');
 
-        foreach ($folders as $folder) {
-            if (Folder::exists(JPATH_ROOT . $folder)) {
-                Folder::delete(JPATH_ROOT . $folder);
-            }
-        }
+			// Check to make sure our data is valid
+			if (!$category->check())
+			{
+				JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError()));
 
-        return true;
-    }
+				return;
+			}
 
-    /**
-     * Function to perform changes during install
-     *
-     * @param   JInstallerAdapterComponent  $parent  The class calling this method
-     *
-     * @return  void
-     *
-     * @since   3.4
-     */
-    public function install($parent)
-    {
-        // Initialize a new category
-        /** @type  Joomla\CMS\Table\Category $category */
-        $category = Table::getInstance('Category', 'Joomla\\CMS\\Table\\');
+			// Now store the category
+			if (!$category->store(true))
+			{
+				JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError()));
 
-        // Check if the Uncategorised category exists before adding it
-        if (!$category->load(['extension' => 'com_weblinks', 'title' => 'Uncategorised'])) {
-            $category->extension        = 'com_weblinks';
-            $category->title            = 'Uncategorised';
-            $category->description      = '';
-            $category->published        = 1;
-            $category->access           = 1;
-            $category->params           = '{"category_layout":"","image":""}';
-            $category->metadata         = '{"author":"","robots":""}';
-            $category->metadesc         = '';
-            $category->metakey          = '';
-            $category->language         = '*';
-            $category->checked_out_time = null;
-            $category->version          = 1;
-            $category->hits             = 0;
-            $category->modified_user_id = 0;
-            $category->checked_out      = null;
+				return;
+			}
 
-            // Set the location in the tree
-            $category->setLocation(1, 'last-child');
+			// Build the path for our category
+			$category->rebuildPath($category->id);
+		}
+	}
 
-            // Check to make sure our data is valid
-            if (!$category->check()) {
-                Factory::getApplication()->enqueueMessage(Text::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError()));
+	/**
+	 * Method to run after the install routine.
+	 *
+	 * @param   string                      $type    The action being performed
+	 * @param   JInstallerAdapterComponent  $parent  The class calling this method
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4.1
+	 */
+	public function postflight($type, $parent)
+	{
+		// Only execute database changes on MySQL databases
+		$dbName = JFactory::getDbo()->name;
 
-                return;
-            }
+		if (strpos($dbName, 'mysql') !== false)
+		{
+			// Add Missing Table Colums if needed
+			$this->addColumnsIfNeeded();
 
-            // Now store the category
-            if (!$category->store(true)) {
-                Factory::getApplication()->enqueueMessage(Text::sprintf('COM_WEBLINKS_ERROR_INSTALL_CATEGORY', $category->getError()));
+			// Drop the Table Colums if needed
+			$this->dropColumnsIfNeeded();
+		}
 
-                return;
-            }
+		// Insert missing UCM Records if needed
+		$this->insertMissingUcmRecords();
+	}
 
-            // Build the path for our category
-            $category->rebuildPath($category->id);
-        }
-    }
+	/**
+	 * Method to insert missing records for the UCM tables
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4.1
+	 */
+	private function insertMissingUcmRecords()
+	{
+		// Insert the rows in the #__content_types table if they don't exist already
+		$db = JFactory::getDbo();
 
-    /**
-     * Method to run after the install routine.
-     *
-     * @param   string                      $type    The action being performed
-     * @param   JInstallerAdapterComponent  $parent  The class calling this method
-     *
-     * @return  void
-     *
-     * @since   3.4.1
-     */
-    public function postflight($type, $parent)
-    {
-        // Only execute database changes on MySQL databases
-        $dbName = Factory::getDbo()->name;
+		// Get the type ID for a Weblink
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('type_id'))
+			->from($db->quoteName('#__content_types'))
+			->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_weblinks.weblink'));
+		$db->setQuery($query);
 
-        if (strpos($dbName, 'mysql') !== false) {
-            // Add Missing Table Columns if needed
-            $this->addColumnsIfNeeded();
+		$weblinkTypeId = $db->loadResult();
 
-            // Drop the Table Columns if needed
-            $this->dropColumnsIfNeeded();
-        }
+		// Get the type ID for a Weblink Category
+		$query->clear('where');
+		$query->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_weblinks.category'));
+		$db->setQuery($query);
 
-        // Insert missing UCM Records if needed
-        $this->insertMissingUcmRecords();
-    }
+		$categoryTypeId = $db->loadResult();
 
-    /**
-     * Method to insert missing records for the UCM tables
-     *
-     * @return  void
-     *
-     * @since   3.4.1
-     */
-    private function insertMissingUcmRecords()
-    {
-        // Insert the rows in the #__content_types table if they don't exist already
-        $db = Factory::getDbo();
+		// Set the table columns to insert table to
+		$columnsArray = array(
+			$db->quoteName('type_title'),
+			$db->quoteName('type_alias'),
+			$db->quoteName('table'),
+			$db->quoteName('rules'),
+			$db->quoteName('field_mappings'),
+			$db->quoteName('router'),
+			$db->quoteName('content_history_options'),
+		);
 
-        // Get the type ID for a Weblink
-        $query = $db->getQuery(true);
-        $query->select($db->quoteName('type_id'))
-            ->from($db->quoteName('#__content_types'))
-            ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_weblinks.weblink'));
-        $db->setQuery($query);
-
-        $weblinkTypeId = $db->loadResult();
-
-        // Get the type ID for a Weblink Category
-        $query->clear('where');
-        $query->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_weblinks.category'));
-        $db->setQuery($query);
-
-        $categoryTypeId = $db->loadResult();
-
-        // Set the table columns to insert table to
-        $columnsArray = [
-            $db->quoteName('type_title'),
-            $db->quoteName('type_alias'),
-            $db->quoteName('table'),
-            $db->quoteName('rules'),
-            $db->quoteName('field_mappings'),
-            $db->quoteName('router'),
-            $db->quoteName('content_history_options'),
-        ];
-
-        // If we have no type id for com_weblinks.weblink insert it
-        if (!$weblinkTypeId) {
-            // Insert the data.
-            $query->clear();
-            $query->insert($db->quoteName('#__content_types'));
-            $query->columns($columnsArray);
-            $query->values(
-                $db->quote('Weblink') . ', '
-                . $db->quote('com_weblinks.weblink') . ', '
-                . $db->quote(
-                    '{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"},
+		// If we have no type id for com_weblinks.weblink insert it
+		if (!$weblinkTypeId)
+		{
+			// Insert the data.
+			$query->clear();
+			$query->insert($db->quoteName('#__content_types'));
+			$query->columns($columnsArray);
+			$query->values(
+				$db->quote('Weblink') . ', '
+				. $db->quote('com_weblinks.weblink') . ', '
+				. $db->quote(
+					'{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"},
 					"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}'
-                ) . ', '
-                . $db->quote('') . ', '
-                . $db->quote(
-                    '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias",
+				) . ', '
+				. $db->quote('') . ', '
+				. $db->quote(
+					'{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias",
 					"core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits",
 					"core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params",
 					"core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"url",
 					"core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc",
 					"core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}'
-                ) . ', '
-                . $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', '
-                . $db->quote(
-                    '{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml",
+				) . ', '
+				. $db->quote('WeblinksHelperRoute::getWeblinkRoute') . ', '
+				. $db->quote(
+					'{"formFile":"administrator\\/components\\/com_weblinks\\/models\\/forms\\/weblink.xml",
 					"hideFields":["asset_id","checked_out","checked_out_time","version","featured","images"], "ignoreChanges":["modified_by",
 					"modified", "checked_out", "checked_out_time", "version", "hits"], "convertToInt":["publish_up", "publish_down", "featured",
 					"ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},
 					{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},
 					{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},
 					{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'
-                )
-            );
+				)
+			);
 
-            $db->setQuery($query);
-            $db->execute();
-        }
+			$db->setQuery($query);
+			$db->execute();
+		}
 
-        // If we have no type id for com_weblinks.category insert it
-        if (!$categoryTypeId) {
-            // Insert the data.
-            $query->clear();
-            $query->insert($db->quoteName('#__content_types'));
-            $query->columns($columnsArray);
-            $query->values(
-                $db->quote('Weblinks Category') . ', '
-                . $db->quote('com_weblinks.category') . ', '
-                . $db->quote('
+		// If we have no type id for com_weblinks.category insert it
+		if (!$categoryTypeId)
+		{
+			// Insert the data.
+			$query->clear();
+			$query->insert($db->quoteName('#__content_types'));
+			$query->columns($columnsArray);
+			$query->values(
+				$db->quote('Weblinks Category') . ', '
+				. $db->quote('com_weblinks.category') . ', '
+				. $db->quote('
 					{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},
-					"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}') . ', '
-                . $db->quote('') . ', '
-                . $db->quote('
+					"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}'
+				) . ', '
+				. $db->quote('') . ', '
+				. $db->quote('
 					{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias",
 					"core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description",
 					"core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access",
 					"core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language",
 					"core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey",
 					"core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"},
-					"special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}') . ', '
-                . $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', '
-                . $db->quote('
+					"special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}'
+				) . ', '
+				. $db->quote('WeblinksHelperRoute::getCategoryRoute') . ', '
+				. $db->quote('
 					{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml",
 					"hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"],
 					"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version",
@@ -268,64 +214,68 @@ class Com_WeblinksInstallerScript
 					"displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id",
 					"displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id",
 					"displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id",
-					"displayColumn":"title"}]}')
-            );
+					"displayColumn":"title"}]}'
+				)
+			);
 
-            $db->setQuery($query);
-            $db->execute();
-        }
-    }
+			$db->setQuery($query);
+			$db->execute();
+		}
+	}
 
-    /**
-     * Method to drop colums from #__weblinks if they still there.
-     *
-     * @return  void
-     *
-     * @since   3.4.1
-     */
-    private function dropColumnsIfNeeded()
-    {
-        $oldColumns = [
-            'sid',
-            'date',
-            'archived',
-            'approved',
-        ];
+	/**
+	 * Method to drop colums from #__weblinks if they still there.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4.1
+	 */
+	private function dropColumnsIfNeeded()
+	{
+		$oldColumns = array(
+			'sid',
+			'date',
+			'archived',
+			'approved',
+		);
 
-        $db    = Factory::getDbo();
-        $table = $db->getTableColumns('#__weblinks');
+		$db    = JFactory::getDbo();
+		$table = $db->getTableColumns('#__weblinks');
 
-        $columns = array_intersect($oldColumns, array_keys($table));
+		$columns = array_intersect($oldColumns, array_keys($table));
 
-        foreach ($columns as $column) {
-            $sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' DROP COLUMN ' . $db->quoteName($column);
-            $db->setQuery($sql);
-            $db->execute();
-        }
-    }
+		foreach ($columns as $column)
+		{
+			$sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' DROP COLUMN ' . $db->quoteName($column);
+			$db->setQuery($sql);
+			$db->execute();
+		}
+	}
 
-    /**
-     * Method to add colums from #__weblinks if they are missing.
-     *
-     * @return  void
-     *
-     * @since   3.4.1
-     */
-    private function addColumnsIfNeeded()
-    {
-        $db    = Factory::getDbo();
-        $table = $db->getTableColumns('#__weblinks');
+	/**
+	 * Method to add colums from #__weblinks if they are missing.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4.1
+	 */
+	private function addColumnsIfNeeded()
+	{
+		$db    = JFactory::getDbo();
+		$table = $db->getTableColumns('#__weblinks');
 
-        if (!array_key_exists('version', $table)) {
-            $sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' ADD COLUMN ' . $db->quoteName('version') . " int unsigned NOT NULL DEFAULT '1'";
-            $db->setQuery($sql);
-            $db->execute();
-        }
+		if (!array_key_exists('version', $table))
+		{
+			$sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' ADD COLUMN ' . $db->quoteName('version') . " int(10) unsigned NOT NULL DEFAULT '1'";
+			$db->setQuery($sql);
+			$db->execute();
+		}
 
-        if (!array_key_exists('images', $table)) {
-            $sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' ADD COLUMN ' . $db->quoteName('images') . ' text NOT NULL';
-            $db->setQuery($sql);
-            $db->execute();
-        }
-    }
+		if (!array_key_exists('images', $table))
+		{
+			$sql = 'ALTER TABLE ' . $db->quoteName('#__weblinks') . ' ADD COLUMN ' . $db->quoteName('images') . ' text NOT NULL';
+			$db->setQuery($sql);
+			$db->execute();
+		}
+	}
 }

src/administrator/components/com_weblinks/services/provider.php

@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Association\AssociationExtensionInterface;
-use Joomla\CMS\Categories\CategoryFactoryInterface;
-use Joomla\CMS\Component\Router\RouterFactoryInterface;
-use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
-use Joomla\CMS\Extension\ComponentInterface;
-use Joomla\CMS\Extension\Service\Provider\CategoryFactory;
-use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
-use Joomla\CMS\Extension\Service\Provider\MVCFactory;
-use Joomla\CMS\Extension\Service\Provider\RouterFactory;
-use Joomla\CMS\HTML\Registry;
-use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\Component\Weblinks\Administrator\Extension\WeblinksComponent;
-use Joomla\Component\Weblinks\Administrator\Helper\AssociationsHelper;
-use Joomla\DI\Container;
-use Joomla\DI\ServiceProviderInterface;
-
-/**
- * The weblinks service provider.
- *
- * @since  4.0.0
- */
-return new class () implements ServiceProviderInterface {
-    /**
-     * Registers the service provider with a DI container.
-     *
-     * @param   Container  $container  The DI container.
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     */
-    public function register(Container $container)
-    {
-        $container->set(AssociationExtensionInterface::class, new AssociationsHelper());
-        $componentNamespace = '\\Joomla\\Component\\Weblinks';
-        $container->registerServiceProvider(new CategoryFactory($componentNamespace));
-        $container->registerServiceProvider(new MVCFactory($componentNamespace));
-        $container->registerServiceProvider(new ComponentDispatcherFactory($componentNamespace));
-        $container->registerServiceProvider(new RouterFactory($componentNamespace));
-        $container->set(ComponentInterface::class, function (Container $container) {
-            $component = new WeblinksComponent($container->get(ComponentDispatcherFactoryInterface::class));
-            $component->setRegistry($container->get(Registry::class));
-            $component->setMVCFactory($container->get(MVCFactoryInterface::class));
-            $component->setCategoryFactory($container->get(CategoryFactoryInterface::class));
-            $component->setAssociationExtension($container->get(AssociationExtensionInterface::class));
-            $component->setRouterFactory($container->get(RouterFactoryInterface::class));
-            return $component;
-        });
-    }
-};

src/administrator/components/com_weblinks/sql/install.mysql.sql

@@ -11,33 +11,33 @@ INSERT INTO `#__content_types` (`type_title`, `type_alias`, `table`, `rules`, `f
 --
 
 CREATE TABLE IF NOT EXISTS `#__weblinks` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `catid` int NOT NULL DEFAULT 0,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `catid` int(11) NOT NULL DEFAULT 0,
   `title` varchar(250) NOT NULL DEFAULT '',
   `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `url` varchar(250) NOT NULL DEFAULT '',
   `description` text NOT NULL,
-  `hits` int NOT NULL DEFAULT 0,
-  `state` tinyint NOT NULL DEFAULT 0,
-  `checked_out` int unsigned,
-  `checked_out_time` datetime,
-  `ordering` int NOT NULL DEFAULT 0,
-  `access` int NOT NULL DEFAULT 1,
+  `hits` int(11) NOT NULL DEFAULT 0,
+  `state` tinyint(1) NOT NULL DEFAULT 0,
+  `checked_out` int(11) NOT NULL DEFAULT 0,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ordering` int(11) NOT NULL DEFAULT 0,
+  `access` int(11) NOT NULL DEFAULT 1,
   `params` text NOT NULL,
   `language` char(7) NOT NULL DEFAULT '',
-  `created` datetime NOT NULL,
-  `created_by` int unsigned NOT NULL DEFAULT 0,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT 0,
   `created_by_alias` varchar(255) NOT NULL DEFAULT '',
-  `modified` datetime NOT NULL,
-  `modified_by` int unsigned NOT NULL DEFAULT 0,
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT 0,
   `metakey` text NOT NULL,
   `metadesc` text NOT NULL,
   `metadata` text NOT NULL,
-  `featured` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Set if link is featured.',
+  `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if link is featured.',
   `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.',
-  `publish_up` datetime,
-  `publish_down` datetime,
-  `version` int unsigned NOT NULL DEFAULT 1,
+  `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `version` int(10) unsigned NOT NULL DEFAULT 1,
   `images` text NOT NULL,
   PRIMARY KEY (`id`),
   KEY `idx_access` (`access`),

src/administrator/components/com_weblinks/sql/install.postgresql.sql

@@ -17,24 +17,24 @@ CREATE TABLE "#__weblinks" (
   "description" text NOT NULL,
   "hits" bigint DEFAULT 0 NOT NULL,
   "state" smallint DEFAULT 0 NOT NULL,
-  "checked_out" integer,
-  "checked_out_time" timestamp without time zone,
+  "checked_out" bigint DEFAULT 0 NOT NULL,
+  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "ordering" bigint DEFAULT 0 NOT NULL,
   "access" bigint DEFAULT 1 NOT NULL,
   "params" text NOT NULL,
   "language" varchar(7) DEFAULT '' NOT NULL,
-  "created" timestamp without time zone NOT NULL,
+  "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "created_by" integer DEFAULT 0 NOT NULL,
   "created_by_alias" varchar(255) DEFAULT '' NOT NULL,
-  "modified" timestamp without time zone NOT NULL,
+  "modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "modified_by" integer DEFAULT 0 NOT NULL,
   "metakey" text NOT NULL,
   "metadesc" text NOT NULL,
   "metadata" text NOT NULL,
   "featured" smallint DEFAULT 0 NOT NULL,
   "xreference" varchar(50) NOT NULL,
-  "publish_up" timestamp without time zone,
-  "publish_down" timestamp without time zone,
+  "publish_up" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "publish_down" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "version" bigint DEFAULT 1 NOT NULL,
   "images" text NOT NULL,
   PRIMARY KEY ("id")

src/administrator/components/com_weblinks/sql/install.sqlsrv.sql

@@ -0,0 +1,84 @@
+/****** Insert data into table [#__content_types] for UCM functions ******/
+INSERT [#__content_types] ([type_title], [type_alias], [table], [rules], [field_mappings], [router], [content_history_options])
+SELECT 'Weblink', 'com_weblinks.weblink', '{"special":{"dbtable":"#__weblinks","key":"id","type":"Weblink","prefix":"WeblinksTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special":{}}', 'WeblinksHelperRoute::getWeblinkRoute', '{"formFile":"administrator\/components\/com_weblinks\/models\/forms\/weblink.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","featured","images"], "ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"], "convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'
+UNION ALL
+SELECT 'Weblinks Category', 'com_weblinks.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'WeblinksHelperRoute::getCategoryRoute', '{"formFile":"administrator\/components\/com_categories\/models\/forms\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}';
+
+/****** Object:  Table [#__weblinks] ******/
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__weblinks](
+	[id] [bigint] IDENTITY(1,1) NOT NULL,
+	[catid] [int] NOT NULL DEFAULT 0,
+	[title] [nvarchar](250) NOT NULL DEFAULT '',
+	[alias] [nvarchar](255) NOT NULL,
+	[url] [nvarchar](250) NOT NULL DEFAULT '',
+	[description] [nvarchar](max) NOT NULL,
+	[hits] [int] NOT NULL DEFAULT 0,
+	[state] [smallint] NOT NULL DEFAULT 0,
+	[checked_out] [int] NOT NULL DEFAULT 0,
+	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[ordering] [int] NOT NULL DEFAULT 0,
+	[access] [int] NOT NULL DEFAULT 1,
+	[params] [nvarchar](max) NOT NULL,
+	[language] [nvarchar](7) NOT NULL DEFAULT '',
+	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_by] [bigint] NOT NULL DEFAULT 0,
+	[created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
+	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_by] [bigint] NOT NULL DEFAULT 0,
+	[metakey] [nvarchar](max) NOT NULL,
+	[metadesc] [nvarchar](max) NOT NULL,
+	[metadata] [nvarchar](max) NOT NULL,
+	[featured] [tinyint] NOT NULL DEFAULT 0,
+	[xreference] [nvarchar](50) NOT NULL,
+	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [version] [bigint] NOT NULL DEFAULT 1,
+	[images] [nvarchar](max) NOT NULL,
+ CONSTRAINT [PK_#__weblinks_id] PRIMARY KEY CLUSTERED
+(
+	[id] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_access] ON [#__weblinks]
+(
+	[access] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_catid] ON [#__weblinks]
+(
+	[catid] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_checkout] ON [#__weblinks]
+(
+	[checked_out] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_createdby] ON [#__weblinks]
+(
+	[created_by] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_featured_catid] ON [#__weblinks]
+(
+	[featured] ASC,
+	[catid] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_language] ON [#__weblinks]
+(
+	[language] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_state] ON [#__weblinks]
+(
+	[state] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_xreference] ON [#__weblinks]
+(
+	[xreference] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);

src/administrator/components/com_weblinks/sql/uninstall.mysql.sql

@@ -1 +1,3 @@
 DELETE FROM `#__content_types` WHERE `type_alias` IN ('com_weblinks.weblink', 'com_weblinks.category');
+
+DROP TABLE IF EXISTS `#__weblinks`;

src/administrator/components/com_weblinks/sql/uninstall.postgresql.sql

@@ -1 +1,3 @@
 DELETE FROM "#__content_types" WHERE "type_alias" IN ('com_weblinks.weblink', 'com_weblinks.category');
+
+DROP TABLE IF EXISTS "#__weblinks";

src/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql

@@ -0,0 +1,3 @@
+DELETE FROM [#__content_types] WHERE [type_alias] IN ('com_weblinks.weblink', 'com_weblinks.category');
+
+DROP TABLE IF EXISTS [#__weblinks];

src/administrator/components/com_weblinks/sql/updates/mysql/4.0.0.sql

@@ -1,35 +0,0 @@
-ALTER TABLE `#__weblinks` MODIFY `created` datetime NOT NULL;
-ALTER TABLE `#__weblinks` MODIFY `modified` datetime NOT NULL;
-
-ALTER TABLE `#__weblinks` MODIFY `publish_up` datetime NULL DEFAULT NULL;
-ALTER TABLE `#__weblinks` MODIFY `publish_down` datetime NULL DEFAULT NULL;
-ALTER TABLE `#__weblinks` MODIFY `checked_out_time` datetime NULL DEFAULT NULL;
-
-ALTER TABLE `#__weblinks` MODIFY `checked_out` int unsigned;
-
-UPDATE `#__weblinks` SET `modified` = `created` WHERE `modified` = '0000-00-00 00:00:00';
-
-UPDATE `#__weblinks` SET `publish_up` = NULL WHERE `publish_up` = '0000-00-00 00:00:00';
-UPDATE `#__weblinks` SET `publish_down` = NULL WHERE `publish_down` = '0000-00-00 00:00:00';
-UPDATE `#__weblinks` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
-
-UPDATE `#__weblinks` SET `checked_out` = null WHERE `checked_out` = 0;
-
-UPDATE `#__categories` SET `modified_time` = `created_time` WHERE `modified_time` = '0000-00-00 00:00:00' AND `extension` = 'com_weblinks';
-
-UPDATE `#__categories` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00' AND `extension` = 'com_weblinks';
-
-UPDATE `#__ucm_content` SET `core_modified_time` = `core_created_time`
- WHERE `core_type_alias` IN ('com_weblinks.weblink', 'com_weblinks.category')
-   AND `core_modified_time` = '0000-00-00 00:00:00';
-
-UPDATE `#__ucm_content` SET `core_publish_up` = NULL
- WHERE `core_type_alias` = 'com_weblinks.weblink'
-   AND `core_publish_up` = '0000-00-00 00:00:00';
-UPDATE `#__ucm_content` SET `core_publish_down` = NULL
- WHERE `core_type_alias` = 'com_weblinks.weblink'
-   AND `core_publish_down` = '0000-00-00 00:00:00';
-
-UPDATE `#__ucm_content` SET `core_checked_out_time` = NULL
- WHERE `core_type_alias` IN ('com_weblinks.weblink', 'com_weblinks.category')
-   AND `core_checked_out_time` = '0000-00-00 00:00:00';

src/administrator/components/com_weblinks/sql/updates/postgresql/4.0.0.sql

@@ -1,42 +0,0 @@
-ALTER TABLE "#__weblinks" ALTER COLUMN "created" DROP DEFAULT;
-
-ALTER TABLE "#__weblinks" ALTER COLUMN "modified" DROP DEFAULT;
-
-ALTER TABLE "#__weblinks" ALTER COLUMN "publish_up" DROP NOT NULL;
-ALTER TABLE "#__weblinks" ALTER COLUMN "publish_up" DROP DEFAULT;
-
-ALTER TABLE "#__weblinks" ALTER COLUMN "publish_down" DROP NOT NULL;
-ALTER TABLE "#__weblinks" ALTER COLUMN "publish_down" DROP DEFAULT;
-
-ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out_time" DROP NOT NULL;
-ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out_time" DROP DEFAULT;
-
-ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out" DROP NOT NULL;
-ALTER TABLE "#__weblinks" ALTER COLUMN "checked_out" DROP DEFAULT;
-
-UPDATE "#__weblinks" SET "modified" = "created" WHERE "modified" = '1970-01-01 00:00:00';
-
-UPDATE "#__weblinks" SET "publish_up" = NULL WHERE "publish_up" = '1970-01-01 00:00:00';
-UPDATE "#__weblinks" SET "publish_down" = NULL WHERE "publish_down" = '1970-01-01 00:00:00';
-UPDATE "#__weblinks" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
-
-UPDATE "#__weblinks" SET "checked_out" = null WHERE "checked_out" = 0;
-
-UPDATE "#__categories" SET "modified_time" = "created_time" WHERE "modified_time" = '1970-01-01 00:00:00' AND "extension" = 'com_weblinks';
-
-UPDATE "#__categories" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00' AND "extension" = 'com_weblinks';
-
-UPDATE "#__ucm_content" SET "core_modified_time" = "core_created_time"
- WHERE "core_type_alias" IN ('com_weblinks.weblink', 'com_weblinks.category')
-   AND "core_modified_time" = '1970-01-01 00:00:00';
-
-UPDATE "#__ucm_content" SET "core_publish_up" = NULL
- WHERE "core_type_alias" = 'com_weblinks.weblink'
-   AND "core_publish_up" = '1970-01-01 00:00:00';
-UPDATE "#__ucm_content" SET "core_publish_down" = NULL
- WHERE "core_type_alias" = 'com_weblinks.weblink'
-   AND "core_publish_down" = '1970-01-01 00:00:00';
-
-UPDATE "#__ucm_content" SET "core_checked_out_time" = NULL
- WHERE "core_type_alias" IN ('com_weblinks.weblink', 'com_weblinks.category')
-   AND "core_checked_out_time" = '1970-01-01 00:00:00';

src/administrator/components/com_weblinks/sql/updates/sqlsrv/3.4.0.sql

@@ -0,0 +1 @@
+# Placeholder file to set the extension database schema version

src/administrator/components/com_weblinks/src/Controller/DisplayController.php

@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Controller;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Router\Route;
-
-/**
- * Weblinks Main Controller
- *
- * @since  1.5
- */
-class DisplayController extends BaseController
-{
-    /**
-     * The default view.
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $default_view = 'weblinks';
-    /**
-         * Method to display a view.
-         *
-         * @param   boolean  $cacheable  If true, the view output will be cached
-         * @param   array    $urlparams  An array of safe url parameters and their variable types,
-         *                               for valid values see {@link JFilterInput::clean()}.
-         *
-         * @return  BaseController|boolean  This object to support chaining.
-         *
-         * @since   1.5
-         */
-    public function display($cacheable = false, $urlparams = false)
-    {
-        $view   = $this->input->get('view', 'weblinks');
-        $layout = $this->input->get('layout', 'default');
-        $id     = $this->input->getInt('id');
-        // Check for edit form.
-        if ($view == 'weblink' && $layout == 'edit' && !$this->checkEditId('com_weblinks.edit.weblink', $id)) {
-            // Somehow the person just went to the form - we don't allow that.
-            if (!\count($this->app->getMessageQueue())) {
-                $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id), 'error');
-            }
-
-            $this->setRedirect(Route::_('index.php?option=com_weblinks&view=weblinks', false));
-            return false;
-        }
-
-        return parent::display();
-    }
-}

src/administrator/components/com_weblinks/src/Controller/WeblinkController.php

@@ -1,130 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Controller;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-use Joomla\CMS\MVC\Controller\FormController;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Versioning\VersionableControllerTrait;
-use Joomla\Utilities\ArrayHelper;
-
-/**
- * Weblink controller class.
- *
- * @since  1.6
- */
-class WeblinkController extends FormController
-{
-    use VersionableControllerTrait;
-
-    /**
-     * Method override to check if you can add a new record.
-     *
-     * @param   array  $data  An array of input data.
-     *
-     * @return  boolean
-     *
-     * @since   1.6
-     */
-    protected function allowAdd($data = [])
-    {
-        $categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
-
-        if ($categoryId) {
-            // If the category has been passed in the URL check it.
-            return $this->app->getIdentity()->authorise('core.create', $this->option . '.category.' . $categoryId);
-        }
-
-        // In the absence of better information, revert to the component permissions.
-        return parent::allowAdd($data);
-    }
-
-    /**
-     * Method to check if you can add a new record.
-     *
-     * @param   array   $data  An array of input data.
-     * @param   string  $key   The name of the key for the primary key.
-     *
-     * @return  boolean
-     *
-     * @since   1.6
-     */
-    protected function allowEdit($data = [], $key = 'id')
-    {
-        $recordId = (int) isset($data[$key]) ? $data[$key] : 0;
-
-        // Since there is no asset tracking, fallback to the component permissions.
-        if (!$recordId) {
-            return parent::allowEdit($data, $key);
-        }
-
-        // Get the item.
-        $item = $this->getModel()->getItem($recordId);
-
-        // Since there is no item, return false.
-        if (empty($item)) {
-            return false;
-        }
-
-        $user = $this->app->getIdentity();
-
-        // Check if can edit own core.edit.own.
-        $canEditOwn = $user->authorise('core.edit.own', $this->option . '.category.' . (int) $item->catid) && $item->created_by == $user->id;
-
-        // Check the category core.edit permissions.
-        return $canEditOwn || $user->authorise('core.edit', $this->option . '.category.' . (int) $item->catid);
-    }
-
-    /**
-     * Method to run batch operations.
-     *
-     * @param   object  $model  The model.
-     *
-     * @return  boolean   True if successful, false otherwise and internal error is set.
-     *
-     * @since   1.7
-     */
-    public function batch($model = null)
-    {
-        $this->checkToken();
-
-        // Set the model
-        $model = $this->getModel('Weblink', 'Administrator', []);
-
-        // Preset the redirect
-        $this->setRedirect(Route::_('index.php?option=com_weblinks&view=weblinks' . $this->getRedirectToListAppend(), false));
-
-        return parent::batch($model);
-    }
-
-    /**
-     * Function that allows child controller access to model data after the data has been saved.
-     *
-     * @param   \Joomla\CMS\MVC\Model\BaseDatabaseModel  $model      The data model object.
-     * @param   array                                    $validData  The validated data.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-    {
-        $task = $this->getTask();
-
-        if ($task == 'save') {
-            $this->setRedirect(Route::_('index.php?option=com_weblinks&view=weblinks', false));
-        }
-    }
-}

src/administrator/components/com_weblinks/src/Controller/WeblinksController.php

@@ -1,40 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Controller;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\MVC\Controller\AdminController;
-
-/**
- * Weblinks list controller class.
- *
- * @since  1.6
- */
-class WeblinksController extends AdminController
-{
-    /**
-     * Proxy for getModel
-     *
-     * @param   string  $name    The model name. Optional.
-     * @param   string  $prefix  The class prefix. Optional.
-     * @param   array   $config  The array of possible config values. Optional.
-     *
-     * @return  object  The model.
-     *
-     * @since   1.6
-     */
-    public function getModel($name = 'Weblink', $prefix = 'Administrator', $config = ['ignore_request' => true])
-    {
-        return parent::getModel($name, $prefix, $config);
-    }
-}

src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php

@@ -1,143 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Extension;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Application\SiteApplication;
-use Joomla\CMS\Association\AssociationServiceInterface;
-use Joomla\CMS\Association\AssociationServiceTrait;
-use Joomla\CMS\Categories\CategoryServiceInterface;
-use Joomla\CMS\Categories\CategoryServiceTrait;
-use Joomla\CMS\Component\Router\RouterServiceInterface;
-use Joomla\CMS\Component\Router\RouterServiceTrait;
-use Joomla\CMS\Extension\BootableExtensionInterface;
-use Joomla\CMS\Extension\MVCComponent;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Fields\FieldsServiceInterface;
-use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Tag\TagServiceInterface;
-use Joomla\CMS\Tag\TagServiceTrait;
-use Joomla\Component\Weblinks\Administrator\Service\HTML\AdministratorService;
-use Joomla\Component\Weblinks\Administrator\Service\HTML\Icon;
-use Psr\Container\ContainerInterface;
-
-/**
- * Component class for com_weblinks
- *
- * @since  4.0.0
- */
-class WeblinksComponent extends MVCComponent implements
-    CategoryServiceInterface,
-    AssociationServiceInterface,
-    TagServiceInterface,
-    RouterServiceInterface,
-    BootableExtensionInterface,
-    FieldsServiceInterface
-{
-    use CategoryServiceTrait;
-    use AssociationServiceTrait;
-    use HTMLRegistryAwareTrait;
-    use RouterServiceTrait;
-    use CategoryServiceTrait, TagServiceTrait {
-        CategoryServiceTrait::getTableNameForSection insteadof TagServiceTrait;
-        CategoryServiceTrait::getStateColumnForSection insteadof TagServiceTrait;
-    }
-
-    /**
-     * Booting the extension. This is the function to set up the environment of the extension like
-     * registering new class loaders, etc.
-     *
-     * If required, some initial set up can be done from services of the container, eg.
-     * registering HTML services.
-     *
-     * @param   ContainerInterface  $container  The container
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     */
-
-
-    public function boot(ContainerInterface $container)
-    {
-        $this->getRegistry()->register('weblinksadministrator', new AdministratorService());
-        $this->getRegistry()->register('weblinkicon', new Icon($container->get(SiteApplication::class)));
-    }
-
-    /**
-     * Returns a valid section for the given section. If it is not valid then null
-     * is returned.
-     *
-     * @param   string  $section  The section to get the mapping for
-     * @param   object  $item     The item
-     *
-     * @return  string|null  The new section
-     *
-     * @since   4.0.0
-     */
-    public function validateSection($section, $item = null)
-    {
-        if ($section != 'weblink') {
-            // We don't know other sections
-            return null;
-        }
-
-        return $section;
-    }
-
-    /**
-     * Returns valid contexts
-     *
-     * @return  array
-     *
-     * @since   4.0.0
-     */
-    public function getContexts(): array
-    {
-        Factory::getLanguage()->load('com_weblinks', JPATH_ADMINISTRATOR);
-        $contexts = [
-            'com_weblinks.weblink' => Text::_('COM_WEBLINKS'),
-        ];
-        return $contexts;
-    }
-
-
-    /**
-     * Returns the table for the count items functions for the given section.
-     *
-     * @param   string  $section  The section
-     *
-     * @return  string|null
-     *
-     * @since   4.0.0
-     */
-    protected function getTableNameForSection(string $section = null)
-    {
-        return ($section === 'category' ? 'categories' : 'weblinks');
-    }
-
-    /**
-     * Returns the state column for the count items functions for the given section.
-     *
-     * @param   string  $section  The section
-     *
-     * @return  string|null
-     *
-     * @since   4.0.0
-     */
-    protected function getStateColumnForSection(string $section = null)
-    {
-        return 'state';
-    }
-}

src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php

@@ -1,251 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Field\Modal;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormField;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Session\Session;
-use Joomla\Database\ParameterType;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-/**
- * Supports a modal weblink picker.
- *
- * @since  __DEPLOY_VERSION__
- */
-class WeblinkField extends FormField
-{
-    /**
-     * The form field type.
-     *
-     * @var    string
-     * @since  __DEPLOY_VERSION__
-     */
-    protected $type = 'Modal_Weblink';
-    /**
-         * Method to get the field input markup.
-         *
-         * @return  string  The field input markup.
-         *
-         * @since   __DEPLOY_VERSION__
-         */
-    protected function getInput()
-    {
-        $allowNew    = ((string) $this->element['new'] == 'true');
-        $allowEdit   = ((string) $this->element['edit'] == 'true');
-        $allowClear  = ((string) $this->element['clear'] != 'false');
-        $allowSelect = ((string) $this->element['select'] != 'false');
-        // Load language
-        Factory::getLanguage()->load('com_weblinks', JPATH_ADMINISTRATOR);
-        // The active weblink id field.
-        $value = (int) $this->value > 0 ? (int) $this->value : '';
-        // Create the modal id.
-        $modalId = 'Weblink_' . $this->id;
-        /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
-        $wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-        // Add the modal field script to the document head.
-        $wa->useScript('field.modal-fields');
-        // Script to proxy the select modal function to the modal-fields.js file.
-        if ($allowSelect) {
-            static $scriptSelect = null;
-            if (is_null($scriptSelect)) {
-                $scriptSelect = [];
-            }
-
-            if (!isset($scriptSelect[$this->id])) {
-                $wa->addInlineScript(
-                    "
-				window.jSelectWeblink_" . $this->id . " = function (id, title, catid, object, url, language) {
-					window.processModalSelect('Article', '" . $this->id . "', id, title, catid, object, url, language);
-				}",
-                    [],
-                    ['type' => 'module']
-                );
-                Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED');
-                $scriptSelect[$this->id] = true;
-            }
-        }
-
-        // Setup variables for display.
-        $linkWeblinks = 'index.php?option=com_weblinks&amp;view=weblinks&amp;layout=modal&amp;tmpl=component&amp;' . Session::getFormToken() . '=1';
-        $linkWeblink  = 'index.php?option=com_weblinks&amp;view=weblink&amp;layout=modal&amp;tmpl=component&amp;' . Session::getFormToken() . '=1';
-        $modalTitle   = Text::_('COM_WEBLINKS_CHANGE_WEBLINK');
-        if (isset($this->element['language'])) {
-            $linkWeblinks .= '&amp;forcedLanguage=' . $this->element['language'];
-            $linkWeblink .= '&amp;forcedLanguage=' . $this->element['language'];
-            $modalTitle .= ' &#8212; ' . $this->element['label'];
-        }
-
-        $urlSelect = $linkWeblinks . '&amp;function=jSelectWeblink_' . $this->id;
-        $urlEdit   = $linkWeblink . '&amp;task=weblink.edit&amp;id=\' + document.getElementById("' . $this->id . '_id").value + \'';
-        $urlNew    = $linkWeblink . '&amp;task=weblink.add';
-        if ($value) {
-            $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
-                ->select($db->quoteName('title'))
-                ->from($db->quoteName('#__weblinks'))
-                ->where($db->quoteName('id') . ' = :id')
-                ->bind(':id', $value, ParameterType::INTEGER);
-            $db->setQuery($query);
-            try {
-                $title = $db->loadResult();
-            } catch (\RuntimeException $e) {
-                Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
-            }
-        }
-
-        $title = empty($title) ? Text::_('COM_WEBLINKS_SELECT_A_WEBLINK') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
-        // The current weblink display field.
-        $html = '';
-        if ($allowSelect || $allowNew || $allowEdit || $allowClear) {
-            $html .= '<span class="input-group">';
-        }
-
-        $html .= '<input class="form-control" id="' . $this->id . '_name" type="text" value="' . $title . '" readonly size="35">';
-        // Select weblink button
-        if ($allowSelect) {
-            $html .= '<button'
-                . ' class="btn btn-primary' . ($value ? ' hidden' : '') . '"'
-                . ' id="' . $this->id . '_select"'
-                . ' data-bs-toggle="modal"'
-                . ' type="button"'
-                . ' data-bs-target="#ModalSelect' . $modalId . '">'
-                . '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
-                . '</button>';
-        }
-
-        // New weblink button
-        if ($allowNew) {
-            $html .= '<button'
-                . ' class="btn btn-secondary' . ($value ? ' hidden' : '') . '"'
-                . ' id="' . $this->id . '_new"'
-                . ' data-bs-toggle="modal"'
-                . ' type="button"'
-                . ' data-bs-target="#ModalNew' . $modalId . '">'
-                . '<span class="icon-plus" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
-                . '</button>';
-        }
-
-        // Edit weblink button
-        if ($allowEdit) {
-            $html .= '<button'
-                . ' class="btn btn-primary' . ($value ? '' : ' hidden') . '"'
-                . ' id="' . $this->id . '_edit"'
-                . ' data-bs-toggle="modal"'
-                . ' type="button"'
-                . ' data-bs-target="#ModalEdit' . $modalId . '">'
-                . '<span class="icon-pen-square" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
-                . '</button>';
-        }
-
-        // Clear weblink button
-        if ($allowClear) {
-            $html .= '<button'
-                . ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
-                . ' id="' . $this->id . '_clear"'
-                . ' type="button"'
-                . ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
-                . '<span class="icon-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
-                . '</button>';
-        }
-
-        if ($allowSelect || $allowNew || $allowEdit || $allowClear) {
-            $html .= '</span>';
-        }
-
-        // Select weblink modal
-        if ($allowSelect) {
-            $html .= HTMLHelper::_('bootstrap.renderModal', 'ModalSelect' . $modalId, [
-                    'title'      => $modalTitle,
-                    'url'        => $urlSelect,
-                    'height'     => '400px',
-                    'width'      => '800px',
-                    'bodyHeight' => 70,
-                    'modalWidth' => 80,
-                    'footer'     => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
-                        . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
-                ]);
-        }
-
-        $closeButtonClick = "window.processModalEdit(this,  '$this->id', 'add', 'weblink', 'cancel', 'weblink-form'); return false;";
-        $saveButtonClick  = "window.processModalEdit(this,  '$this->id', 'add', 'weblink', 'save', 'weblink-form'); return false;";
-        $applyButtonClick = "window.processModalEdit(this,  '$this->id', 'add', 'weblink', 'apply', 'weblink-form'); return false;";
-        // New weblink modal
-        if ($allowNew) {
-            $html .= HTMLHelper::_('bootstrap.renderModal', 'ModalNew' . $modalId, [
-                    'title'       => Text::_('COM_WEBLINKS_NEW_WEBLINK'),
-                    'backdrop'    => 'static',
-                    'keyboard'    => false,
-                    'closeButton' => false,
-                    'url'         => $urlNew,
-                    'height'      => '400px',
-                    'width'       => '800px',
-                    'bodyHeight'  => '70',
-                    'modalWidth'  => '80',
-                    'footer'      => '<a role="button" class="btn" aria-hidden="true"'
-                        . ' onclick="' . $closeButtonClick . '">'
-                        . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
-                        . '<a role="button" class="btn btn-primary" aria-hidden="true"'
-                        . ' onclick="' . $saveButtonClick . '">'
-                        . Text::_('JSAVE') . '</a>'
-                        . '<a role="button" class="btn btn-success" aria-hidden="true"'
-                        . ' onclick="' . $applyButtonClick . '">'
-                        . Text::_('JAPPLY') . '</a>',
-                ]);
-        }
-
-        // Edit weblink modal
-        if ($allowEdit) {
-            $html .= HTMLHelper::_('bootstrap.renderModal', 'ModalEdit' . $modalId, [
-                    'title'       => Text::_('COM_WEBLINKS_EDIT_WEBLINK'),
-                    'backdrop'    => 'static',
-                    'keyboard'    => false,
-                    'closeButton' => false,
-                    'url'         => $urlEdit,
-                    'height'      => '400px',
-                    'width'       => '800px',
-                    'bodyHeight'  => '70',
-                    'modalWidth'  => '80',
-                    'footer'      => '<a role="button" class="btn" aria-hidden="true"'
-                        . ' onclick="' . $closeButtonClick . '">'
-                        . Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
-                        . '<a role="button" class="btn btn-primary" aria-hidden="true"'
-                        . ' onclick="' . $saveButtonClick . '">'
-                        . Text::_('JSAVE') . '</a>'
-                        . '<a role="button" class="btn btn-success" aria-hidden="true"'
-                        . ' onclick="' . $applyButtonClick . '">'
-                        . Text::_('JAPPLY') . '</a>',
-                ]);
-        }
-
-        // Note: class='required' for client side validation.
-        $class = $this->required ? ' class="required modal-value"' : '';
-        $html .= '<input type="hidden" id="' . $this->id . '_id" ' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
-            . '" data-text="' . htmlspecialchars(Text::_('COM_WEBLINKS_SELECT_A_WEBLINK', true), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '" />';
-        return $html;
-    }
-
-    /**
-     * Method to get the field label markup.
-     *
-     * @return  string  The field label markup.
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    protected function getLabel()
-    {
-        return str_replace($this->id, $this->id . '_name', parent::getLabel());
-    }
-}

src/administrator/components/com_weblinks/src/Helper/AssociationsHelper.php

@@ -1,188 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Helper;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Association\AssociationExtensionHelper;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Table\Table;
-use Joomla\Component\Weblinks\Site\Helper\AssociationHelper;
-
-/**
- * Content associations helper.
- *
- * @since  __DEPLOY_VERSION__
- */
-class AssociationsHelper extends AssociationExtensionHelper
-{
-    /**
-     * The extension name
-     *
-     * @var     string $extension
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    protected $extension = 'com_weblinks';
-
-    /**
-     * Array of item types
-     *
-     * @var     array $itemTypes
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    protected $itemTypes = ['weblink', 'category'];
-
-    /**
-     * Has the extension association support
-     *
-     * @var     boolean $associationsSupport
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    protected $associationsSupport = true;
-
-    /**
-     * Method to get the associations for a given item.
-     *
-     * @param   integer  $id    Id of the item
-     * @param   string   $view  Name of the view
-     *
-     * @return  array   Array of associations for the item
-     *
-     * @since  4.0.0
-     */
-    public function getAssociationsForItem($id = 0, $view = null)
-    {
-        return AssociationHelper::getAssociations($id, $view);
-    }
-
-    /**
-     * Get the associated items for an item
-     *
-     * @param   string  $typeName  The item type
-     * @param   int     $id        The id of item for which we need the associated items
-     *
-     * @return  array
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function getAssociations($typeName, $id)
-    {
-        $type       = $this->getType($typeName);
-        $context    = $this->extension . '.item';
-        $catidField = 'catid';
-        if ($typeName === 'category') {
-            $context    = 'com_categories.item';
-            $catidField = '';
-        }
-
-        // Get the associations.
-        $associations = Associations::getAssociations($this->extension, $type['tables']['a'], $context, $id, 'id', 'alias', $catidField);
-        return $associations;
-    }
-
-    /**
-     * Get item information
-     *
-     * @param   string  $typeName  The item type
-     * @param   int     $id        The id of item for which we need the associated items
-     *
-     * @return  Table|null
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function getItem($typeName, $id)
-    {
-        if (empty($id)) {
-            return null;
-        }
-
-        $table = null;
-        switch ($typeName) {
-            case 'weblink':
-                $table = Table::getInstance('WeblinkTable', 'Joomla\\Component\\Weblinks\\Administrator\\Table\\');
-
-                break;
-            case 'category':
-                $table = Table::getInstance('Category', 'Joomla\\CMS\\Table\\');
-
-                break;
-        }
-
-        if (empty($table)) {
-            return null;
-        }
-
-        $table->load($id);
-        return $table;
-    }
-
-    /**
-     * Get information about the type
-     *
-     * @param   string  $typeName  The item type
-     *
-     * @return  array  Array of item types
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function getType($typeName = '')
-    {
-        $fields  = $this->getFieldsTemplate();
-        $tables  = [];
-        $joins   = [];
-        $support = $this->getSupportTemplate();
-        $title   = '';
-        if (in_array($typeName, $this->itemTypes)) {
-            switch ($typeName) {
-                case 'weblink':
-                    $support['state']     = true;
-                    $support['acl']       = true;
-                    $support['checkout']  = true;
-                    $support['category']  = true;
-                    $support['save2copy'] = true;
-                    $tables               = [
-                        'a' => '#__weblinks',
-                    ];
-                    $title = 'weblink';
-
-                    break;
-                case 'category':
-                    $fields['created_user_id'] = 'a.created_user_id';
-                    $fields['ordering']        = 'a.lft';
-                    $fields['level']           = 'a.level';
-                    $fields['catid']           = '';
-                    $fields['state']           = 'a.published';
-                    $support['state']          = true;
-                    $support['acl']            = true;
-                    $support['checkout']       = true;
-                    $support['level']          = true;
-                    $tables                    = [
-                        'a' => '#__categories',
-                    ];
-                    $title = 'category';
-
-                    break;
-            }
-        }
-
-        return [
-            'fields'  => $fields,
-            'support' => $support,
-            'tables'  => $tables,
-            'joins'   => $joins,
-            'title'   => $title,
-        ];
-    }
-}

src/administrator/components/com_weblinks/src/Helper/WeblinksHelper.php

@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Helper;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Helper\ContentHelper;
-
-/**
- * Weblinks helper.
- *
- * @since  1.6
- */
-class WeblinksHelper extends ContentHelper
-{
-}

src/administrator/components/com_weblinks/src/Model/WeblinkModel.php

@@ -1,418 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Model;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Form\Form;
-use Joomla\CMS\Helper\TagsHelper;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Language\LanguageHelper;
-use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Versioning\VersionableModelTrait;
-use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
-
-/**
- * Weblinks model.
- *
- * @since  1.5
- */
-class WeblinkModel extends AdminModel
-{
-    use VersionableModelTrait;
-
-    /**
-     * The type alias for this content type.
-     *
-     * @var    string
-     * @since  3.2
-     */
-    public $typeAlias = 'com_weblinks.weblink';
-
-    /**
-     * The context used for the associations table
-     *
-     * @var    string
-     * @since  __DEPLOY_VERSION__
-     */
-    protected $associationsContext = 'com_weblinks.item';
-
-    /**
-     * The prefix to use with controller messages.
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $text_prefix = 'COM_WEBLINKS';
-
-    /**
-     * Method to test whether a record can be deleted.
-     *
-     * @param   object  $record  A record object.
-     *
-     * @return  boolean  True if allowed to delete the record. Defaults to the permission for the component.
-     *
-     * @since   1.6
-     */
-    protected function canDelete($record)
-    {
-        if (empty($record->id) || $record->state != -2) {
-            return false;
-        }
-
-        return $this->getCurrentUser()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid);
-    }
-
-    /**
-     * Method to test whether a record can be deleted.
-     *
-     * @param   object  $record  A record object.
-     *
-     * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the component.
-     *
-     * @since   1.6
-     */
-    protected function canEditState($record)
-    {
-        if (!empty($record->catid)) {
-            return $this->getCurrentUser()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid);
-        }
-
-        return parent::canEditState($record);
-    }
-
-    /**
-     * Abstract method for getting the form from the model.
-     *
-     * @param   array    $data      Data for the form.
-     * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
-     *
-     * @return  mixed  A JForm object on success, false on failure
-     *
-     * @since   1.6
-     */
-    public function getForm($data = [], $loadData = true)
-    {
-        // Get the form.
-        $form = $this->loadForm('com_weblinks.weblink', 'weblink', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        // Determine correct permissions to check.
-        if ($this->getState('weblink.id')) {
-            // Existing record. Can only edit in selected categories.
-            $form->setFieldAttribute('catid', 'action', 'core.edit');
-        } else {
-            // New record. Can only create in selected categories.
-            $form->setFieldAttribute('catid', 'action', 'core.create');
-        }
-
-        // Modify the form based on access controls.
-        if (!$this->canEditState((object) $data)) {
-            // Disable fields for display.
-            $form->setFieldAttribute('ordering', 'disabled', 'true');
-            $form->setFieldAttribute('state', 'disabled', 'true');
-            $form->setFieldAttribute('publish_up', 'disabled', 'true');
-            $form->setFieldAttribute('publish_down', 'disabled', 'true');
-
-            // Disable fields while saving.
-            // The controller has already verified this is a record you can edit.
-            $form->setFieldAttribute('ordering', 'filter', 'unset');
-            $form->setFieldAttribute('state', 'filter', 'unset');
-            $form->setFieldAttribute('publish_up', 'filter', 'unset');
-            $form->setFieldAttribute('publish_down', 'filter', 'unset');
-        }
-
-        // Don't allow to change the created_by user if not allowed to access com_users.
-        if (!$this->getCurrentUser()->authorise('core.manage', 'com_users')) {
-            $form->setFieldAttribute('created_by', 'filter', 'unset');
-        }
-
-        return $form;
-    }
-
-    /**
-     * Method to get the data that should be injected in the form.
-     *
-     * @return  array  The default data is an empty array.
-     *
-     * @since   1.6
-     */
-    protected function loadFormData()
-    {
-        $app = Factory::getApplication();
-
-        // Check the session for previously entered form data.
-        $data = $app->getUserState('com_weblinks.edit.weblink.data', []);
-
-        if (empty($data)) {
-            $data = $this->getItem();
-
-            // Prime some default values.
-            if ($this->getState('weblink.id') == 0) {
-                $data->set('catid', $app->input->get('catid', $app->getUserState('com_weblinks.weblinks.filter.category_id'), 'int'));
-            }
-        }
-
-        $this->preprocessData('com_weblinks.weblink', $data);
-
-        return $data;
-    }
-
-    /**
-     * Method to get a single record.
-     *
-     * @param   integer  $pk  The id of the primary key.
-     *
-     * @return  mixed  Object on success, false on failure.
-     *
-     * @since   1.6
-     */
-    public function getItem($pk = null)
-    {
-        if ($item = parent::getItem($pk)) {
-            // Convert the metadata field to an array.
-            $registry       = new Registry($item->metadata ?? '');
-            $item->metadata = $registry->toArray();
-
-            // Convert the images field to an array.
-            $registry     = new Registry($item->images ?? '');
-            $item->images = $registry->toArray();
-
-            // Load associated web links items
-            $assoc = Associations::isEnabled();
-
-            if ($assoc) {
-                $item->associations = [];
-
-                if ($item->id != null) {
-                    $associations = Associations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $item->id);
-
-                    foreach ($associations as $tag => $association) {
-                        $item->associations[$tag] = $association->id;
-                    }
-                }
-            }
-
-            if (!empty($item->id)) {
-                $item->tags = new TagsHelper();
-                $item->tags->getTagIds($item->id, 'com_weblinks.weblink');
-                $item->metadata['tags'] = $item->tags;
-            }
-        }
-
-        return $item;
-    }
-
-    /**
-     * Prepare and sanitise the table data prior to saving.
-     *
-     * @param   \Joomla\CMS\Table\Table  $table  A reference to a JTable object.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    protected function prepareTable($table)
-    {
-        $date = Factory::getDate();
-        $user = $this->getCurrentUser();
-
-        $table->title = htmlspecialchars_decode($table->title, ENT_QUOTES);
-        $table->alias = ApplicationHelper::stringURLSafe($table->alias);
-
-        if (empty($table->alias)) {
-            $table->alias = ApplicationHelper::stringURLSafe($table->title);
-        }
-
-        if (empty($table->id)) {
-            // Set the values
-
-            // Set ordering to the last item if not set
-            if (empty($table->ordering)) {
-                $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
-                    ->select('MAX(ordering)')
-                    ->from($db->quoteName('#__weblinks'));
-
-                $db->setQuery($query);
-                $max = $db->loadResult();
-
-                $table->ordering = $max + 1;
-            } else {
-                // Set the values
-                $table->modified    = $date->toSql();
-                $table->modified_by = $user->id;
-            }
-        }
-
-        // Increment the weblink version number.
-        $table->version++;
-    }
-
-    /**
-     * A protected method to get a set of ordering conditions.
-     *
-     * @param   \Joomla\CMS\Table\Table  $table  A JTable object.
-     *
-     * @return  array  An array of conditions to add to ordering queries.
-     *
-     * @since   1.6
-     */
-    protected function getReorderConditions($table)
-    {
-        $condition   = [];
-        $condition[] = 'catid = ' . (int) $table->catid;
-
-        return $condition;
-    }
-
-    /**
-     * Method to save the form data.
-     *
-     * @param   array  $data  The form data.
-     *
-     * @return  boolean  True on success.
-     *
-     * @since    3.1
-     */
-    public function save($data)
-    {
-        $app = Factory::getApplication();
-
-        // Cast catid to integer for comparison
-        $catid = (int) $data['catid'];
-
-        // Check if New Category exists
-        if ($catid > 0) {
-            $catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_weblinks');
-        }
-
-        // Save New Category
-        if ($catid == 0 && $this->canCreateCategory()) {
-            $table              = [];
-            $table['title']     = $data['catid'];
-            $table['parent_id'] = 1;
-            $table['extension'] = 'com_weblinks';
-            $table['language']  = $data['language'];
-            $table['published'] = 1;
-
-            // Create new category and get catid back
-            $data['catid'] = CategoriesHelper::createCategory($table);
-        }
-
-        // Alter the title for save as copy
-        if ($app->input->get('task') == 'save2copy') {
-            [$name, $alias] = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']);
-            $data['title']  = $name;
-            $data['alias']  = $alias;
-            $data['state']  = 0;
-        }
-
-        return parent::save($data);
-    }
-
-    /**
-     * Method to change the title & alias.
-     *
-     * @param   integer  $category_id  The id of the parent.
-     * @param   string   $alias        The alias.
-     * @param   string   $name         The title.
-     *
-     * @return  array  Contains the modified title and alias.
-     *
-     * @since   3.1
-     */
-    protected function generateNewTitle($category_id, $alias, $name)
-    {
-        // Alter the title & alias
-        $table = $this->getTable();
-
-        while ($table->load(['alias' => $alias, 'catid' => $category_id])) {
-            if ($name == $table->title) {
-                $name = StringHelper::increment($name);
-            }
-
-            $alias = StringHelper::increment($alias, 'dash');
-        }
-
-        return [$name, $alias];
-    }
-
-    /**
-     * Allows preprocessing of the JForm object.
-     *
-     * @param   \JForm  $form   The form object
-     * @param   array   $data   The data to be merged into the form object
-     * @param   string  $group  The plugin group to be executed
-     *
-     * @return  void
-     *
-     * @since    3.6.0
-     */
-    protected function preprocessForm(Form $form, $data, $group = 'content')
-    {
-        if ($this->canCreateCategory()) {
-            $form->setFieldAttribute('catid', 'allowAdd', 'true');
-        }
-
-        // Association weblinks items
-        if (Associations::isEnabled()) {
-            $languages = LanguageHelper::getContentLanguages(false, false, null, 'ordering', 'asc');
-
-            if (count($languages) > 1) {
-                $addform = new \SimpleXMLElement('<form />');
-                $fields  = $addform->addChild('fields');
-                $fields->addAttribute('name', 'associations');
-                $fieldset = $fields->addChild('fieldset');
-                $fieldset->addAttribute('name', 'item_associations');
-
-                foreach ($languages as $language) {
-                    $field = $fieldset->addChild('field');
-                    $field->addAttribute('name', $language->lang_code);
-                    $field->addAttribute('type', 'modal_weblink');
-                    $field->addAttribute('language', $language->lang_code);
-                    $field->addAttribute('label', $language->title);
-                    $field->addAttribute('translate_label', 'false');
-                    $field->addAttribute('select', 'true');
-                    $field->addAttribute('new', 'true');
-                    $field->addAttribute('edit', 'true');
-                    $field->addAttribute('clear', 'true');
-                    $field->addAttribute('addfieldprefix', 'Joomla\\Component\\Weblinks\\Administrator\\Field');
-                }
-
-                $form->load($addform, false);
-            }
-        }
-
-        parent::preprocessForm($form, $data, $group);
-    }
-
-    /**
-     * Is the user allowed to create an on the fly category?
-     *
-     * @return  bool
-     *
-     * @since   3.6.0
-     */
-    private function canCreateCategory()
-    {
-        return $this->getCurrentUser()->authorise('core.create', 'com_weblinks');
-    }
-}

src/administrator/components/com_weblinks/src/Model/WeblinksModel.php

@@ -1,279 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Model;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\Database\ParameterType;
-
-/**
- * Methods supporting a list of weblink records.
- *
- * @since  1.6
- */
-class WeblinksModel extends ListModel
-{
-    /**
-     * Constructor.
-     *
-     * @param   array                $config   An optional associative array of configuration settings.
-     * @param   MVCFactoryInterface  $factory  The factory.
-     *
-     * @see     JControllerLegacy
-     * @since   1.6
-     */
-    public function __construct($config = [], MVCFactoryInterface $factory = null)
-    {
-        if (empty($config['filter_fields'])) {
-            $config['filter_fields'] = [
-                'id', 'a.id',
-                'title', 'a.title',
-                'alias', 'a.alias',
-                'checked_out', 'a.checked_out',
-                'checked_out_time', 'a.checked_out_time',
-                'catid', 'a.catid', 'category_id',
-                'c.title', 'category_title',
-                'state', 'a.state', 'published',
-                'access', 'a.access',
-                'ag.title', 'access_level',
-                'created', 'a.created',
-                'created_by', 'a.created_by',
-                'ordering', 'a.ordering',
-                'featured', 'a.featured',
-                'language', 'a.language',
-                'l.title', 'language_title',
-                'hits', 'a.hits',
-                'publish_up', 'a.publish_up',
-                'publish_down', 'a.publish_down',
-                'url', 'a.url',
-                'tag',
-                'level', 'c.level',
-            ];
-
-            $assoc = Associations::isEnabled();
-
-            if ($assoc) {
-                $config['filter_fields'][] = 'association';
-            }
-        }
-
-        parent::__construct($config, $factory);
-    }
-
-    /**
-     * Method to auto-populate the model state.
-     *
-     * @param   string  $ordering   An optional ordering field.
-     * @param   string  $direction  An optional direction (asc|desc).
-     *
-     * @return  void
-     *
-     * @note    Calling getState in this method will result in recursion.
-     * @since   1.6
-     */
-    protected function populateState($ordering = 'a.title', $direction = 'asc')
-    {
-        $app = Factory::getApplication();
-
-        $forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
-
-        // Adjust the context to support modal layouts.
-        if ($layout = $app->input->get('layout')) {
-            $this->context .= '.' . $layout;
-        }
-
-        // Adjust the context to support forced languages.
-        if ($forcedLanguage) {
-            $this->context .= '.' . $forcedLanguage;
-        }
-
-        // Load the parameters.
-        $params = ComponentHelper::getParams('com_weblinks');
-        $this->setState('params', $params);
-
-        // Force a language.
-        if (!empty($forcedLanguage)) {
-            $this->setState('filter.language', $forcedLanguage);
-        }
-
-        // List state information.
-        parent::populateState($ordering, $direction);
-    }
-
-    /**
-     * Method to get a store id based on model configuration state.
-     *
-     * This is necessary because the model is used by the component and
-     * different modules that might need different sets of data or different
-     * ordering requirements.
-     *
-     * @param   string  $id  A prefix for the store id.
-     *
-     * @return  string  A store id.
-     *
-     * @since   1.6
-     */
-    protected function getStoreId($id = '')
-    {
-        // Compile the store id.
-        $id .= ':' . $this->getState('filter.search');
-        $id .= ':' . $this->getState('filter.access');
-        $id .= ':' . $this->getState('filter.published');
-        $id .= ':' . $this->getState('filter.category_id');
-        $id .= ':' . $this->getState('filter.language');
-        $id .= ':' . $this->getState('filter.tag');
-        $id .= ':' . $this->getState('filter.level');
-
-        return parent::getStoreId($id);
-    }
-
-    /**
-     * Build an SQL query to load the list data.
-     *
-     * @return  \JDatabaseQuery
-     *
-     * @since   1.6
-     */
-    protected function getListQuery()
-    {
-        // Create a new query object.
-        $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
-        $user  = $this->getCurrentUser();
-
-        // Select the required fields from the table.
-        $query->select(
-            $this->getState(
-                'list.select',
-                'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.created, a.created_by, ' .
-                'a.hits, a.state, a.access, a.ordering, a.language, a.publish_up, a.publish_down'
-            )
-        );
-        $query->from($db->quoteName('#__weblinks', 'a'));
-
-        // Join over the language
-        $query->select($db->quoteName('l.title', 'language_title'))
-            ->select($db->quoteName('l.image', 'language_image'))
-            ->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->qn('l.lang_code') . ' = ' . $db->qn('a.language'));
-
-        // Join over the users for the checked out user.
-        $query->select($db->quoteName('uc.name', 'editor'))
-            ->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->qn('uc.id') . ' = ' . $db->qn('a.checked_out'));
-
-        // Join over the asset groups.
-        $query->select($db->quoteName('ag.title', 'access_level'))
-            ->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->qn('ag.id') . ' = ' . $db->qn('a.access'));
-
-        // Join over the categories.
-        $query->select('c.title AS category_title')
-            ->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn('a.catid'));
-
-        // Join over the associations.
-        $assoc = Associations::isEnabled();
-
-        if ($assoc) {
-            $query->select('COUNT(asso2.id)>1 AS association')
-                ->join('LEFT', $db->quoteName('#__associations', 'asso') . ' ON asso.id = a.id AND asso.context = ' . $db->quote('com_weblinks.item'))
-                ->join('LEFT', $db->quoteName('#__associations', 'asso2') . ' ON asso2.key = asso.key')
-                ->group('a.id, l.title, l.image, uc.name, ag.title, c.title');
-        }
-
-        // Filter by access level.
-        if ($access = $this->getState('filter.access')) {
-            $query->where($db->quoteName('a.access') . ' = :access')
-                ->bind(':access', $access, ParameterType::INTEGER);
-        }
-
-        // Implement View Level Access
-        if (!$user->authorise('core.admin')) {
-            $query->whereIn($db->quoteName('a.access'), $user->getAuthorisedViewLevels());
-        }
-
-        // Filter by published state
-        $published = (string) $this->getState('filter.published');
-
-        if (is_numeric($published)) {
-            $query->where($db->quoteName('a.state') . ' = :state')
-                ->bind(':state', $published, ParameterType::INTEGER);
-        } elseif ($published === '') {
-            $query->whereIn($db->quoteName('a.state'), [0, 1]);
-        }
-
-        // Filter by category.
-        $categoryId = $this->getState('filter.category_id');
-
-        if (is_numeric($categoryId)) {
-            $query->where($db->quoteName('a.catid') . ' = :catid')
-                ->bind(':catid', $categoryId, ParameterType::INTEGER);
-        }
-
-        // Filter on the level.
-        if ($level = $this->getState('filter.level')) {
-            $query->where($db->quoteName('c.level') . ' <= :level')
-                ->bind(':level', $level, ParameterType::INTEGER);
-        }
-
-        // Filter by search in title
-        $search = $this->getState('filter.search');
-
-        if (!empty($search)) {
-            if (stripos($search, 'id:') === 0) {
-                $search = substr($search, 3);
-                $query->where($db->quoteName('a.id') . ' = :id')
-                    ->bind(':id', $search, ParameterType::INTEGER);
-            } else {
-                $search = '%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%');
-                $query->where('(' . $db->quoteName('a.title') . ' LIKE :title OR ' . $db->quoteName('a.alias') . ' LIKE :alias)')
-                    ->bind(':title', $search)
-                    ->bind(':alias', $search);
-            }
-        }
-
-        // Filter on the language.
-        if ($language = $this->getState('filter.language')) {
-            $query->where($db->quoteName('a.language') . ' = :language')
-                ->bind(':language', $language);
-        }
-
-        $tagId = $this->getState('filter.tag');
-
-        // Filter by a single tag.
-        if (is_numeric($tagId)) {
-            $query->where($db->quoteName('tagmap.tag_id') . ' = :tagId')
-                ->bind(':tagId', $tagId, ParameterType::INTEGER)
-                ->join(
-                    'LEFT',
-                    $db->quoteName('#__contentitem_tag_map', 'tagmap')
-                    . ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
-                    . ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_weblinks.weblink')
-                );
-        }
-
-        // Add the list ordering clause.
-        $orderCol  = $this->state->get('list.ordering', 'a.title');
-        $orderDirn = $this->state->get('list.direction', 'ASC');
-
-        if ($orderCol == 'a.ordering' || $orderCol == 'category_title') {
-            $orderCol = 'c.title ' . $orderDirn . ', a.ordering';
-        }
-
-        $query->order($db->escape($orderCol . ' ' . $orderDirn));
-
-        return $query;
-    }
-}

src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php

@@ -1,101 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   (C) 2009 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Service\HTML;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Language\LanguageHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\Database\ParameterType;
-
-/**
- * Weblinks HTML helper class.
- *
- * @since  1.6
- */
-class AdministratorService
-{
-    /**
-     * Get the associated language flags
-     *
-     * @param   integer  $weblinkid  The item id to search associations
-     *
-     * @return  string  The language HTML
-     *
-     * @throws  \Exception
-     */
-    public function association($weblinkid)
-    {
-        // Defaults
-        $html = '';
-        // Get the associations
-        if ($associations = Associations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $weblinkid)) {
-            foreach ($associations as $tag => $associated) {
-                $associations[$tag] = (int) $associated->id;
-            }
-
-            // Get the associated contact items
-            $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
-                ->select([
-                        $db->quoteName('c.id'),
-                        $db->quoteName('c.title', 'title'),
-                        $db->quoteName('l.sef', 'lang_sef'),
-                        $db->quoteName('lang_code'),
-                        $db->quoteName('cat.title', 'category_title'),
-                        $db->quoteName('l.image'),
-                        $db->quoteName('l.title', 'language_title'),
-                    ])
-                ->from($db->quoteName('#__weblinks', 'c'))
-                ->join('LEFT', $db->quoteName('#__categories', 'cat'), $db->quoteName('cat.id') . ' = ' . $db->quoteName('c.catid'))
-                ->join('LEFT', $db->quoteName('#__languages', 'l'), $db->quoteName('c.language') . ' = ' . $db->quoteName('l.lang_code'))
-                ->whereIn($db->quoteName('c.id'), array_values($associations))
-                ->where($db->quoteName('c.id') . ' != :id')
-                ->bind(':id', $weblinkid, ParameterType::INTEGER);
-            $db->setQuery($query);
-            try {
-                $items = $db->loadObjectList('id');
-            } catch (\RuntimeException $e) {
-                throw new \Exception($e->getMessage(), 500, $e);
-            }
-
-            if ($items) {
-                $app               = Factory::getApplication();
-                $languages         = LanguageHelper::getContentLanguages([0, 1]);
-                $content_languages = array_column($languages, 'lang_code');
-                foreach ($items as &$item) {
-                    if (in_array($item->lang_code, $content_languages)) {
-                        $text    = $item->lang_code;
-                        $url     = Route::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id);
-                        $tooltip = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
-                            . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8')
-                            . '<br>' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title);
-                        $classes    = 'badge bg-secondary';
-                        $item->link = '<a href="' . $url . '" class="' . $classes . '">' . $text . '</a>'
-                            . '<div role="tooltip" id="tip-' . (int) $weblinkid . '-' . (int) $item->id . '">' . $tooltip . '</div>';
-                    } else {
-                        // Display warning if Content Language is trashed or deleted
-                        $app->enqueueMessage(Text::sprintf('JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING', $item->lang_code), 'warning');
-                    }
-                }
-            }
-
-            $html = LayoutHelper::render('joomla.content.associations', $items);
-        }
-
-        return $html;
-    }
-}

src/administrator/components/com_weblinks/src/Service/HTML/Icon.php

@@ -1,154 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Service\HTML;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Uri\Uri;
-use Joomla\Component\Weblinks\Site\Helper\RouteHelper;
-use Joomla\Registry\Registry;
-
-/**
- * Weblinks Component HTML Helper
- *
- * @since  4.0.0
- */
-class Icon
-{
-    /**
-     * The application
-     *
-     * @var    CMSApplication
-     *
-     * @since  4.0.0
-     */
-    private $application;
-    /**
-         * Service constructor
-         *
-         * @param   CMSApplication  $application  The application
-         *
-         * @since   4.0.0
-         */
-    public function __construct(CMSApplication $application)
-    {
-        $this->application = $application;
-    }
-
-    /**
-     * Method to generate a link to the create item page for the given category
-     *
-     * @param   object    $category  The category information
-     * @param   Registry  $params    The item parameters
-     * @param   array     $attribs   Optional attributes for the link
-     *
-     * @return  string  The HTML markup for the create item link
-     *
-     * @since  4.0.0
-     */
-    public static function create($category, $params, $attribs = [])
-    {
-        $uri  = Uri::getInstance();
-        $url  = 'index.php?option=com_weblinks&task=weblink.add&return=' . base64_encode($uri) . '&w_id=0&catid=' . $category->id;
-        $text = LayoutHelper::render('joomla.content.icons.create', ['params' => $params, 'legacy' => false]);
-        // Add the button classes to the attribs array
-        if (isset($attribs['class'])) {
-            $attribs['class'] .= ' btn btn-primary';
-        } else {
-            $attribs['class'] = 'btn btn-primary';
-        }
-
-        $button = HTMLHelper::_('link', Route::_($url), $text, $attribs);
-        $output = '<span class="hasTooltip" title="' . HTMLHelper::_('tooltipText', 'COM_WEBLINKS_FORM_CREATE_WEBLINK') . '">' . $button . '</span>';
-        return $output;
-    }
-
-    /**
-     * Display an edit icon for the weblink.
-     *
-     * This icon will not display in a popup window, nor if the weblink is trashed.
-     * Edit access checks must be performed in the calling code.
-     *
-     * @param   object    $weblink  The weblink information
-     * @param   Registry  $params   The item parameters
-     * @param   array     $attribs  Optional attributes for the link
-     * @param   boolean   $legacy   True to use legacy images, false to use icomoon based graphic
-     *
-     * @return  string   The HTML for the weblink edit icon.
-     *
-     * @since   4.0.0
-     */
-    public static function edit($weblink, $params, $attribs = [], $legacy = false)
-    {
-        $user = Factory::getApplication()->getIdentity();
-        $uri  = Uri::getInstance();
-        // Ignore if in a popup window.
-        if ($params && $params->get('popup')) {
-            return '';
-        }
-
-        // Ignore if the state is negative (trashed).
-        if ($weblink->state < 0) {
-            return '';
-        }
-
-        // Show checked_out icon if the contact is checked out by a different user
-        if (
-            property_exists($weblink, 'checked_out')
-            && property_exists($weblink, 'checked_out_time')
-            && $weblink->checked_out
-            && $weblink->checked_out !== $user->get('id')
-        ) {
-            $checkoutUser = Factory::getUser($weblink->checked_out);
-            $date         = HTMLHelper::_('date', $weblink->checked_out_time);
-            $tooltip      = Text::sprintf('COM_WEBLINKS_CHECKED_OUT_BY', $checkoutUser->name)
-                . ' <br> ' . $date;
-            $text                        = LayoutHelper::render('joomla.content.icons.edit_lock', ['contact' => $weblink, 'tooltip' => $tooltip, 'legacy' => $legacy]);
-            $attribs['aria-describedby'] = 'editweblink-' . (int) $weblink->id;
-            $output                      = HTMLHelper::_('link', '#', $text, $attribs);
-            return $output;
-        }
-
-        $weblinkUrl = RouteHelper::getWeblinkRoute($weblink->slug, $weblink->catid, $weblink->language);
-        $url        = $weblinkUrl . '&task=weblink.edit&w_id=' . $weblink->id . '&return=' . base64_encode($uri);
-        if ((int) $weblink->state === 0) {
-            $tooltip = Text::_('COM_WEBLINKS_EDIT_UNPUBLISHED_WEBLINK');
-        } else {
-            $tooltip = Text::_('COM_WEBLINKS_EDIT_PUBLISHED_WEBLINK');
-        }
-
-        $nowDate = strtotime(Factory::getDate());
-        $icon    = $weblink->state ? 'edit' : 'eye-slash';
-
-        if (
-            ($weblink->publish_up !== null && strtotime($weblink->publish_up) > $nowDate)
-            || ($weblink->publish_down !== null && strtotime($weblink->publish_down) < $nowDate
-            && $weblink->publish_down !== Factory::getDbo()->getNullDate())
-        ) {
-            $icon = 'eye-slash';
-        }
-
-        $aria_described = 'editweblink-' . (int) $weblink->id;
-        $text           = '<span class="icon-' . $icon . '" aria-hidden="true"></span>';
-        $text .= Text::_('JGLOBAL_EDIT');
-        $text .= '<div role="tooltip" id="' . $aria_described . '">' . $tooltip . '</div>';
-        $attribs['aria-describedby'] = $aria_described;
-        $output                      = HTMLHelper::_('link', Route::_($url), $text, $attribs);
-        return $output;
-    }
-}

src/administrator/components/com_weblinks/src/Table/WeblinkTable.php

@@ -1,254 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\Table;
-
-use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Filter\InputFilter;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\String\PunycodeHelper;
-use Joomla\CMS\Table\Table;
-use Joomla\CMS\Tag\TaggableTableInterface;
-use Joomla\CMS\Tag\TaggableTableTrait;
-use Joomla\CMS\Versioning\VersionableTableInterface;
-use Joomla\Database\ParameterType;
-use Joomla\String\StringHelper;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-/**
- * Weblink Table class
- *
- * @since  1.5
- */
-class WeblinkTable extends Table implements VersionableTableInterface, TaggableTableInterface
-{
-    use TaggableTableTrait;
-
-    /**
-         * Indicates that columns fully support the NULL value in the database
-         *
-         * @var    boolean
-         * @since  __DEPLOY_VERSION__
-         */
-
-
-    protected $_supportNullValue = true;
-    /**
-         * Ensure the params and metadata in json encoded in the bind method
-         *
-         * @var    array
-         * @since  3.4
-         */
-    protected $_jsonEncode = ['params', 'metadata', 'images'];
-    /**
-         * Constructor
-         *
-         * @param   \JDatabaseDriver  &$db  A database connector object
-         *
-         * @since   1.5
-         */
-    public function __construct($db)
-    {
-        $this->typeAlias = 'com_weblinks.weblink';
-        parent::__construct('#__weblinks', 'id', $db);
-        // Set the published column alias
-        $this->setColumnAlias('published', 'state');
-    }
-
-    /**
-     * Overload the store method for the Weblinks table.
-     *
-     * @param   boolean  $updateNulls  Toggle whether null values should be updated.
-     *
-     * @return  boolean  True on success, false on failure.
-     *
-     * @since   1.6
-     */
-    public function store($updateNulls = true)
-    {
-        $date           = Factory::getDate()->toSql();
-        $user           = Factory::getApplication()->getIdentity();
-        $this->modified = $date;
-        if ($this->id) {
-            // Existing item
-            $this->modified_by = $user->id;
-            $this->modified    = $date;
-        } else {
-            // New weblink. A weblink created and created_by field can be set by the user,
-            // so we don't touch either of these if they are set.
-            if (!(int) $this->created) {
-                $this->created = $date;
-            }
-
-            if (empty($this->created_by)) {
-                $this->created_by = $user->id;
-            }
-
-            if (!(int) $this->modified) {
-                $this->modified = $date;
-            }
-
-            if (empty($this->modified_by)) {
-                $this->modified_by = $user->id;
-            }
-
-            if (empty($this->hits)) {
-                $this->hits = 0;
-            }
-        }
-
-        // Set publish_up to null if not set
-        if (!$this->publish_up) {
-            $this->publish_up = null;
-        }
-
-        // Set publish_down to null if not set
-        if (!$this->publish_down) {
-            $this->publish_down = null;
-        }
-
-        // Verify that the alias is unique
-        $table = new WeblinkTable($this->getDbo());
-
-        if (
-            $table->load(['language' => $this->language, 'alias' => $this->alias, 'catid' => (int) $this->catid])
-            && ($table->id != $this->id || $this->id == 0)
-        ) {
-            $this->setError(Text::_('COM_WEBLINKS_ERROR_UNIQUE_ALIAS'));
-            return false;
-        }
-
-        // Convert IDN urls to punycode
-        $this->url = PunycodeHelper::urlToPunycode($this->url);
-        return parent::store($updateNulls);
-    }
-
-    /**
-     * Overloaded check method to ensure data integrity.
-     *
-     * @return  boolean  True on success.
-     *
-     * @since   1.5
-     */
-    public function check()
-    {
-        if (InputFilter::checkAttribute(['href', $this->url])) {
-            $this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_PROVIDE_URL'));
-            return false;
-        }
-
-        // Check for valid name
-        if (trim($this->title) == '') {
-            $this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_TITLE'));
-            return false;
-        }
-
-        // Check for existing name
-        $db    = $this->getDbo();
-        $query = $db->getQuery(true)
-            ->select($db->quoteName('id'))
-            ->from($db->quoteName('#__weblinks'))
-            ->where($db->quoteName('title') . ' = :title')
-            ->where($db->quoteName('language') . ' = :language')
-            ->where($db->quoteName('catid') . ' = :catid')
-            ->bind(':title', $this->title)
-            ->bind(':language', $this->language)
-            ->bind(':catid', $this->catid, ParameterType::INTEGER);
-        $db->setQuery($query);
-        $xid = (int) $db->loadResult();
-        if ($xid && $xid != (int) $this->id) {
-            $this->setError(Text::_('COM_WEBLINKS_ERR_TABLES_NAME'));
-            return false;
-        }
-
-        if (empty($this->alias)) {
-            $this->alias = $this->title;
-        }
-
-        $this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);
-        if (trim(str_replace('-', '', $this->alias)) == '') {
-            $this->alias = Factory::getDate()->format("Y-m-d-H-i-s");
-        }
-
-        // Check the publish down date is not earlier than publish up.
-        if ((int) $this->publish_down > 0 && $this->publish_down < $this->publish_up) {
-            $this->setError(Text::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
-            return false;
-        }
-
-        /*
-      * Clean up keywords -- eliminate extra spaces between phrases
-      * and cr (\r) and lf (\n) characters from string
-         */
-        if (!empty($this->metakey)) {
-            // Array of characters to remove
-            $bad_characters = ["\n", "\r", "\"", "<", ">"];
-            $after_clean    = StringHelper::str_ireplace($bad_characters, "", $this->metakey);
-            $keys           = explode(',', $after_clean);
-            $clean_keys     = [];
-            foreach ($keys as $key) {
-                // Ignore blank keywords
-                if (trim($key)) {
-                    $clean_keys[] = trim($key);
-                }
-            }
-
-            // Put array back together delimited by ", "
-            $this->metakey = implode(", ", $clean_keys);
-        }
-
-        /**
-         * Ensure any new items have compulsory fields set. This is needed for things like
-         * frontend editing where we don't show all the fields or using some kind of API
-         */
-        if (!$this->id) {
-            if (!isset($this->xreference)) {
-                $this->xreference = '';
-            }
-
-            if (!isset($this->metakey)) {
-                $this->metakey = '';
-            }
-
-            if (!isset($this->metadesc)) {
-                $this->metadesc = '';
-            }
-
-            if (!isset($this->images)) {
-                $this->images = '{}';
-            }
-
-            if (!isset($this->metadata)) {
-                $this->metadata = '{}';
-            }
-
-            if (!isset($this->params)) {
-                $this->params = '{}';
-            }
-        }
-
-        return parent::check();
-    }
-
-    /**
-     * Get the type alias for the history table
-     *
-     * @return  string  The alias as described above
-     *
-     * @since   4.0.0
-     */
-    public function getTypeAlias()
-    {
-        return $this->typeAlias;
-    }
-}

src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php

@@ -1,168 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\View\Weblink;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\GenericDataException;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-
-/**
- * View to edit a weblink.
- *
- * @since  1.5
- */
-class HtmlView extends BaseHtmlView
-{
-    /**
-     * The Form object
-     *
-     * @var  \Joomla\CMS\Form\Form
-     */
-    protected $form;
-
-    /**
-     * The active item
-     *
-     * @var  object
-     */
-    protected $item;
-
-    /**
-     * The model state
-     *
-     * @var  \Joomla\CMS\Object\CMSObject
-     */
-    protected $state;
-
-    /**
-     * Display the view.
-     *
-     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
-     *
-     * @return  mixed  A string if successful, otherwise an Error object.
-     */
-    public function display($tpl = null)
-    {
-        $this->state = $this->get('State');
-        $this->item  = $this->get('Item');
-        $this->form  = $this->get('Form');
-
-        // Check for errors.
-        if (count($errors = $this->get('Errors'))) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
-
-        // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'cmd')) {
-            // Set the language field to the forcedLanguage and disable changing it.
-            $this->form->setValue('language', null, $forcedLanguage);
-            $this->form->setFieldAttribute('language', 'readonly', 'true');
-
-            // Only allow to select categories with All language or with the forced language.
-            $this->form->setFieldAttribute('catid', 'language', '*,' . $forcedLanguage);
-
-            // Only allow to select tags with All language or with the forced language.
-            $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
-        }
-
-        $this->addToolbar();
-
-        parent::display($tpl);
-    }
-
-    /**
-     * Add the page title and toolbar.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    protected function addToolbar()
-    {
-        $app = Factory::getApplication();
-        $app->input->set('hidemainmenu', true);
-
-        $user       = $this->getCurrentUser();
-        $isNew      = ($this->item->id == 0);
-        $checkedOut = $this->item->checked_out && $this->item->checked_out !== $user->get('id');
-
-        // Since we don't track these assets at the item level, use the category id.
-        $canDo = ContentHelper::getActions('com_weblinks', 'category', $this->item->catid);
-
-        ToolbarHelper::title($isNew ? Text::_('COM_WEBLINKS_MANAGER_WEBLINK_NEW') : Text::_('COM_WEBLINKS_MANAGER_WEBLINK_EDIT'), 'link weblinks');
-
-        // Build the actions for new and existing records.
-        if ($isNew) {
-            // For new records, check the create permission.
-            if (count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0) {
-                ToolbarHelper::apply('weblink.apply');
-
-                ToolbarHelper::saveGroup(
-                    [
-                        ['save', 'weblink.save'],
-                        ['save2new', 'weblink.save2new'],
-                    ],
-                    'btn-success'
-                );
-            }
-
-            ToolbarHelper::cancel('weblink.cancel');
-        } else {
-            // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
-            $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $user->id);
-
-            $toolbarButtons = [];
-
-            // Can't save the record if it's checked out and editable
-            if (!$checkedOut && $itemEditable) {
-                ToolbarHelper::apply('weblink.apply');
-
-                $toolbarButtons[] = ['save', 'weblink.save'];
-
-                // We can save this record, but check the create permission to see if we can return to make a new one.
-                if ($canDo->get('core.create')) {
-                    $toolbarButtons[] = ['save2new', 'weblink.save2new'];
-                }
-            }
-
-            // If checked out, we can still save
-            if ($canDo->get('core.create')) {
-                $toolbarButtons[] = ['save2copy', 'weblink.save2copy'];
-            }
-
-            ToolbarHelper::saveGroup(
-                $toolbarButtons,
-                'btn-success'
-            );
-
-            ToolbarHelper::cancel('weblink.cancel', 'JTOOLBAR_CLOSE');
-
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
-                ToolbarHelper::versions('com_weblinks.weblink', $this->item->id);
-            }
-
-            if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations')) {
-                ToolbarHelper::custom('weblink.editAssociations', 'contract', '', 'JTOOLBAR_ASSOCIATIONS', false, false);
-            }
-        }
-
-        ToolbarHelper::help('Components_Weblinks_Links_Edit');
-    }
-}

src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php

@@ -1,192 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Component\Weblinks\Administrator\View\Weblinks;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\GenericDataException;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\Toolbar;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-
-/**
- * View class for a list of weblinks.
- *
- * @since  1.5
- */
-class HtmlView extends BaseHtmlView
-{
-    /**
-     * An array of items
-     *
-     * @var  array
-     */
-    protected $items;
-
-    /**
-     * The pagination object
-     *
-     * @var  \Joomla\CMS\Pagination\Pagination
-     */
-    protected $pagination;
-
-    /**
-     * The model state
-     *
-     * @var  \Joomla\CMS\Object\CMSObject
-     */
-    protected $state;
-
-    /**
-     * Form object for search filters
-     *
-     * @var  \Joomla\CMS\Form\Form
-     */
-    public $filterForm;
-
-    /**
-     * The active search filters
-     *
-     * @var  array
-     */
-    public $activeFilters;
-
-    /**
-    * Is this view an Empty State
-    *
-    * @var  boolean
-    * @since 4.0.0
-    */
-    private $isEmptyState = false;
-
-    /**
-     * Display the view.
-     *
-     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
-     *
-     * @return  mixed  A string if successful, otherwise an Error object.
-     */
-    public function display($tpl = null)
-    {
-        $this->state         = $this->get('State');
-        $this->items         = $this->get('Items');
-        $this->pagination    = $this->get('Pagination');
-        $this->filterForm    = $this->get('FilterForm');
-        $this->activeFilters = $this->get('ActiveFilters');
-
-        // Check for errors.
-        if (count($errors = $this->get('Errors'))) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
-
-        if (!\count($this->items) && $this->isEmptyState = $this->get('IsEmptyState')) {
-            $this->setLayout('emptystate');
-        }
-
-        // We don't need toolbar in the modal layout.
-        if ($this->getLayout() !== 'modal') {
-            $this->addToolbar();
-        } else {
-            // In article associations modal we need to remove language filter if forcing a language.
-            // We also need to change the category filter to show show categories with All or the forced language.
-            if ($forcedLanguage = Factory::getApplication()->input->get('forcedLanguage', '', 'CMD')) {
-                // If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
-                $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
-                $this->filterForm->setField($languageXml, 'filter', true);
-
-                // Also, unset the active language filter so the search tools is not open by default with this filter.
-                unset($this->activeFilters['language']);
-
-                // One last changes needed is to change the category filter to just show categories with All language or with the forced language.
-                $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
-            }
-        }
-
-        parent::display($tpl);
-    }
-
-    /**
-     * Add the page title and toolbar.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    protected function addToolbar()
-    {
-        $canDo = ContentHelper::getActions('com_weblinks', 'category', $this->state->get('filter.category_id'));
-        $user  = $this->getCurrentUser();
-
-        // Get the toolbar object instance
-        $toolbar = Toolbar::getInstance('toolbar');
-
-        ToolbarHelper::title(Text::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks');
-
-        if ($canDo->get('core.create') || \count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0) {
-            ToolbarHelper::addNew('weblink.add');
-        }
-
-        if (!$this->isEmptyState && $canDo->get('core.edit.state')) {
-            $dropdown = $toolbar->dropdownButton('status-group')
-                ->text('JTOOLBAR_CHANGE_STATUS')
-                ->toggleSplit(false)
-                ->icon('icon-ellipsis-h')
-                ->buttonClass('btn btn-action')
-                ->listCheck(true);
-
-            $childBar = $dropdown->getChildToolbar();
-
-            $childBar->publish('weblinks.publish')->listCheck(true);
-
-            $childBar->unpublish('weblinks.unpublish')->listCheck(true);
-
-            $childBar->archive('weblinks.archive')->listCheck(true);
-
-            if ($user->authorise('core.admin')) {
-                $childBar->checkin('weblinks.checkin')->listCheck(true);
-            }
-
-            if ($this->state->get('filter.published') != -2) {
-                $childBar->trash('weblinks.trash')->listCheck(true);
-            }
-
-            // Add a batch button
-            if (
-                $user->authorise('core.create', 'com_weblinks')
-                && $user->authorise('core.edit', 'com_weblinks')
-                && $user->authorise('core.edit.state', 'com_weblinks')
-            ) {
-                $childBar->popupButton('batch')
-                    ->text('JTOOLBAR_BATCH')
-                    ->selector('collapseModal')
-                    ->listCheck(true);
-            }
-        }
-
-        if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
-            $toolbar->delete('weblinks.delete')
-                ->text('JTOOLBAR_EMPTY_TRASH')
-                ->message('JGLOBAL_CONFIRM_DELETE')
-                ->listCheck(true);
-        }
-
-        if ($user->authorise('core.admin', 'com_weblinks') || $user->authorise('core.options', 'com_weblinks')) {
-            ToolbarHelper::preferences('com_weblinks');
-        }
-
-        ToolbarHelper::help('Components_Weblinks_Links');
-    }
-}

src/administrator/components/com_weblinks/tables/weblink.php

@@ -0,0 +1,204 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Weblink Table class
+ *
+ * @since  1.5
+ */
+class WeblinksTableWeblink extends JTable
+{
+	/**
+	 * Ensure the params and metadata in json encoded in the bind method
+	 *
+	 * @var    array
+	 * @since  3.4
+	 */
+	protected $_jsonEncode = array('params', 'metadata', 'images');
+
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  &$db  A database connector object
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__weblinks', 'id', $db);
+
+		// Set the published column alias
+		$this->setColumnAlias('published', 'state');
+
+		if (version_compare(JVERSION, '4.0', '<') == 1)
+		{
+			JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink'));
+			JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink'));
+		}
+	}
+
+	/**
+	 * Overload the store method for the Weblinks table.
+	 *
+	 * @param   boolean  $updateNulls  Toggle whether null values should be updated.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		$this->modified = $date->toSql();
+
+		if ($this->id)
+		{
+			// Existing item
+			$this->modified_by = $user->id;
+		}
+		else
+		{
+			// New weblink. A weblink created and created_by field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->created)
+			{
+				$this->created = $date->toSql();
+			}
+
+			if (empty($this->created_by))
+			{
+				$this->created_by = $user->id;
+			}
+		}
+
+		// Set publish_up to null date if not set
+		if (!$this->publish_up)
+		{
+			$this->publish_up = $this->getDbo()->getNullDate();
+		}
+
+		// Set publish_down to null date if not set
+		if (!$this->publish_down)
+		{
+			$this->publish_down = $this->getDbo()->getNullDate();
+		}
+
+		// Verify that the alias is unique
+		$table = JTable::getInstance('Weblink', 'WeblinksTable', array('dbo' => $this->getDbo()));
+
+		if ($table->load(array('language' => $this->language, 'alias' => $this->alias, 'catid' => $this->catid))
+			&& ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(JText::_('COM_WEBLINKS_ERROR_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		// Convert IDN urls to punycode
+		$this->url = JStringPunycode::urlToPunycode($this->url);
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Overloaded check method to ensure data integrity.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.5
+	 */
+	public function check()
+	{
+		if (JFilterInput::checkAttribute(array('href', $this->url)))
+		{
+			$this->setError(JText::_('COM_WEBLINKS_ERR_TABLES_PROVIDE_URL'));
+
+			return false;
+		}
+
+		// Check for valid name
+		if (trim($this->title) == '')
+		{
+			$this->setError(JText::_('COM_WEBLINKS_ERR_TABLES_TITLE'));
+
+			return false;
+		}
+
+		// Check for existing name
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__weblinks'))
+			->where($db->quoteName('title') . ' = ' . $db->quote($this->title))
+			->where($db->quoteName('language') . ' = ' . $db->quote($this->language))
+			->where($db->quoteName('catid') . ' = ' . (int) $this->catid);
+		$db->setQuery($query);
+
+		$xid = (int) $db->loadResult();
+
+		if ($xid && $xid != (int) $this->id)
+		{
+			$this->setError(JText::_('COM_WEBLINKS_ERR_TABLES_NAME'));
+
+			return false;
+		}
+
+		if (empty($this->alias))
+		{
+			$this->alias = $this->title;
+		}
+
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias, $this->language);
+
+		if (trim(str_replace('-', '', $this->alias)) == '')
+		{
+			$this->alias = JFactory::getDate()->format("Y-m-d-H-i-s");
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ($this->publish_down > $db->getNullDate() && $this->publish_down < $this->publish_up)
+		{
+			$this->setError(JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
+
+			return false;
+		}
+
+		/*
+		 * Clean up keywords -- eliminate extra spaces between phrases
+		 * and cr (\r) and lf (\n) characters from string
+		 */
+		if (!empty($this->metakey))
+		{
+			// Array of characters to remove
+			$bad_characters = array("\n", "\r", "\"", "<", ">");
+			$after_clean = JString::str_ireplace($bad_characters, "", $this->metakey);
+			$keys = explode(',', $after_clean);
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				// Ignore blank keywords
+				if (trim($key))
+				{
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->metakey = implode(", ", $clean_keys);
+		}
+
+		return parent::check();
+	}
+}

src/administrator/components/com_weblinks/tmpl/weblink/edit.php

@@ -1,118 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-HTMLHelper::_('behavior.formvalidator');
-$app = Factory::getApplication();
-$input = $app->input;
-$assoc = Associations::isEnabled();
-// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
-$this->ignore_fieldsets = array('details', 'images', 'item_associations', 'jmetadata');
-$this->useCoreUI = true;
-// In case of modal
-$isModal = $input->get('layout') == 'modal' ? true : false;
-$layout  = $isModal ? 'modal' : 'edit';
-$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
-?>
-
-<form action="<?php echo Route::_('index.php?option=com_weblinks&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="weblink-form" class="form-validate">
-
-    <?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
-
-    <div class="main-card">
-        <?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
-
-        <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', empty($this->item->id) ? Text::_('COM_WEBLINKS_NEW_WEBLINK', true) : Text::_('COM_WEBLINKS_EDIT_WEBLINK', true)); ?>
-        <div class="row">
-          <div class="col-md-9">
-             <div class="form-vertical">
-                    <div>
-                      <fieldset class="adminform">
-                            <?php echo $this->form->renderField('url'); ?>
-                            <?php echo $this->form->renderField('description'); ?>
-                     </fieldset>
-                    </div>
-             </div>
-         </div>
-         <div class="col-md-3">
-                <?php echo LayoutHelper::render('joomla.edit.global', $this); ?>
-            </div>
-     </div>
-        <?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-        <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'images', Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS', true)); ?>
-      <div class="row">
-          <div class="col-12">
-               <fieldset id="fieldset-image; ?>" class="options-form">
-                    <legend><?php echo Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS'); ?></legend>
-                  <div>
-                        <?php echo $this->form->renderField('imaJGLOBAL_FIELDSET_IMAGE_OPTIONSges'); ?>
-                        <?php foreach ($this->form->getGroup('images') as $field) :
-                            ?>
-                            <?php echo $field->renderField(); ?>
-                            <?php
-                        endforeach; ?>
-                 </div>
-             </fieldset>
-            </div>
-     </div>
-
-        <?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-        <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
-            <div class="row">
-              <div class="col-12 col-lg-6">
-                  <fieldset id="fieldset-publishingdata" class="options-form">
-                        <legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
-                        <?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
-                   </fieldset>
-                </div>
-             <div class="col-12 col-lg-6">
-                  <fieldset id="fieldset-metadata" class="options-form">
-                        <legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
-                        <?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
-                 </fieldset>
-                </div>
-         </div>
-        <?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-        <?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
-
-        <?php if (!$isModal && $assoc) :
-            ?>
-            <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
-             <fieldset id="fieldset-associations" class="options-form">
-                    <legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
-                    <?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
-             </fieldset>
-            <?php echo HTMLHelper::_('uitab.endTab'); ?>
-            <?php
-        elseif ($isModal && $assoc) :
-            ?>
-            <div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
-            <?php
-        endif; ?>
-
-        <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
-
- </div>
-
-    <input type="hidden" name="task" value="" />
-    <input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>" />
-    <?php echo HTMLHelper::_('form.token'); ?>
-</form>

src/administrator/components/com_weblinks/tmpl/weblink/edit_params.php

@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Language\Text;
-$fieldSets = $this->form->getFieldsets('params'); ?>
-<?php foreach ($fieldSets as $name => $fieldSet) :
-    ?>
-    <div class="tab-pane" id="params-<?php echo $name; ?>">
-    <?php if (isset($fieldSet->description) && trim($fieldSet->description)) :
-        ?>
-        <?php echo '<p class="alert alert-info">' . $this->escape(Text::_($fieldSet->description)) . '</p>'; ?>
-        <?php
-    endif; ?>
-    <?php foreach ($this->form->getFieldset($name) as $field) :
-        ?>
-        <div class="control-group">
-            <div class="control-label"><?php echo $field->label; ?></div>
-            <div class="controls"><?php echo $field->input; ?></div>
-     </div>
-        <?php
-    endforeach; ?>
-    </div>
-    <?php
-endforeach; ?>

src/administrator/components/com_weblinks/tmpl/weblink/modal_params.php

@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Language\Text;
-$fieldSets = $this->form->getFieldsets('params'); ?>
-<?php foreach ($fieldSets as $name => $fieldSet) :
-    ?>
-    <div class="tab-pane" id="params-<?php echo $name; ?>">
-    <?php if (isset($fieldSet->description) && trim($fieldSet->description)) :
-        ?>
-        <?php echo '<p class="alert alert-info">' . $this->escape(Text::_($fieldSet->description)) . '</p>'; ?>
-        <?php
-    endif; ?>
-    <?php foreach ($this->form->getFieldset($name) as $field) :
-        ?>
-        <div class="control-group">
-            <div class="control-label"><?php echo $field->label; ?></div>
-            <div class="controls"><?php echo $field->input; ?></div>
-     </div>
-        <?php
-    endforeach; ?>
-    </div>
-    <?php
-endforeach; ?>

src/administrator/components/com_weblinks/tmpl/weblinks/default.php

@@ -1,217 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-/** @var \Joomla\Component\Weblinks\Administrator\View\Weblinks\HtmlView $this */
-
-HTMLHelper::_('behavior.multiselect');
-$user      = Factory::getApplication()->getIdentity();
-$userId    = $user->get('id');
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDirn  = $this->escape($this->state->get('list.direction'));
-$saveOrder = $listOrder == 'a.ordering';
-$assoc     = Associations::isEnabled();
-if ($saveOrder && !empty($this->items)) {
-    $saveOrderingUrl = 'index.php?option=com_weblinks&task=weblinks.saveOrderAjax&tmpl=component';
-    HTMLHelper::_('draggablelist.draggable');
-}
-?>
-<form action="<?php echo Route::_('index.php?option=com_weblinks&view=weblinks'); ?>" method="post" name="adminForm" id="adminForm">
- <div class="row">
-      <div class="col-md-12">
-            <div id="j-main-container" class="j-main-container">
-                <?php
-                // Search tools bar
-                echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]);
-                ?>
-                <?php if (empty($this->items)) :
-                    ?>
-                  <div class="alert alert-info">
-                        <span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
-                        <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-                  </div>
-                    <?php
-                else :
-                    ?>
-                 <table class="table" id="weblinkList">
-                     <caption class="visually-hidden">
-                            <?php echo Text::_('COM_WEBLINKS_WEBLINKS_TABLE_CAPTION'); ?>,
-                            <span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
-                            <span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
-                      </caption>
-                     <thead>
-                        <tr>
-                           <td class="w-1 text-center">
-                                <?php echo HTMLHelper::_('grid.checkall'); ?>
-                         </td>
-                          <th scope="col" class="w-1 text-center d-none d-md-table-cell">
-                                <?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-sort'); ?>
-                          </th>
-                          <th scope="col" style="min-width:85px" class="w-1 text-center">
-                                <?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
-                          </th>
-                          <th scope="col">
-                                <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
-                           </th>
-                          <th scope="col" class="w-10 d-none d-md-table-cell">
-                                <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
-                           </th>
-                          <th scope="col" class="w-10 d-none d-md-table-cell">
-                                <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
-                         </th>
-                            <?php if ($assoc) :
-                                ?>
-                               <th scope="col" class="w-10">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'COM_WEBLINKS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
-                               </th>
-                                <?php
-                            endif; ?>
-                            <?php if (Multilanguage::isEnabled()) :
-                                ?>
-                               <th scope="col" class="w-10 d-none d-md-table-cell">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
-                               </th>
-                                <?php
-                            endif; ?>
-                          <th scope="col" class="w-5 d-none d-md-table-cell">
-                                <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
-                            </th>
-                      </tr>
-                      </thead>
-                        <tbody <?php if ($saveOrder) :
-                            ?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>" data-nested="true"<?php
-                               endif; ?>>
-                        <?php foreach ($this->items as $i => $item) :
-                            ?>
-                            <?php $item->cat_link = Route::_('index.php?option=com_categories&extension=com_weblinks&task=edit&type=other&cid[]=' . $item->catid); ?>
-                            <?php $canCreate      = $user->authorise('core.create', 'com_weblinks.category.' . $item->catid); ?>
-                            <?php $canEdit        = $user->authorise('core.edit', 'com_weblinks.category.' . $item->catid); ?>
-                            <?php $canCheckin     = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || !$item->checked_out; ?>
-                            <?php $canEditOwn     = $user->authorise('core.edit.own', 'com_weblinks.category.' . $item->catid) && $item->created_by == $user->id; ?>
-                            <?php $canChange      = $user->authorise('core.edit.state', 'com_weblinks.category.' . $item->catid) && $canCheckin; ?>
-                            <tr class="row<?php echo $i % 2; ?>" data-draggable-group="<?php echo $item->catid; ?>">
-                               <td class="text-center">
-                                    <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->title); ?>
-                              </td>
-                              <td class="text-center d-none d-md-table-cell">
-                                    <?php
-                                    $iconClass = '';
-                                    if (!$canChange) {
-                                        $iconClass = ' inactive';
-                                    } elseif (!$saveOrder) {
-                                        $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED');
-                                    }
-                                    ?>
-                                    <span class="sortable-handler<?php echo $iconClass; ?>">
-                                       <span class="icon-ellipsis-v" aria-hidden="true"></span>
-                                   </span>
-                                    <?php if ($canChange && $saveOrder) :
-                                        ?>
-                                       <input type="text" name="order[]" size="5"
-                                               value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
-                                        <?php
-                                    endif; ?>
-                              </td>
-                              <td class="text-center">
-                                    <?php echo HTMLHelper::_('jgrid.published', $item->state, $i, 'weblinks.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
-                              </td>
-                              <th scope="row" class="has-context">
-                                   <div>
-                                        <?php if ($item->checked_out) :
-                                            ?>
-                                            <?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?>
-                                            <?php
-                                        endif; ?>
-                                        <?php if ($canEdit || $canEditOwn) :
-                                            ?>
-                                            <a href="<?php echo Route::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape($item->title); ?>">
-                                                <?php echo $this->escape($item->title); ?></a>
-                                            <?php
-                                        else :
-                                            ?>
-                                            <?php echo $this->escape($item->title); ?>
-                                            <?php
-                                        endif; ?>
-                                        <span class="small">
-                                            <?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
-                                       </span>
-                                        <div class="small">
-                                            <?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
-                                      </div>
-                                 </div>
-                             </th>
-                              <td class="small d-none d-md-table-cell">
-                                    <?php echo $this->escape($item->access_level); ?>
-                                </td>
-                              <td class="d-none d-md-table-cell">
-                                    <?php echo $item->hits; ?>
-                             </td>
-                                <?php if ($assoc) :
-                                    ?>
-                                   <td class="hidden-phone hidden-tablet">
-                                        <?php if ($item->association) :
-                                            ?>
-                                            <?php echo HTMLHelper::_('weblinksadministrator.association', $item->id); ?>
-                                            <?php
-                                        endif; ?>
-                                    </td>
-                                    <?php
-                                endif; ?>
-                                <?php if (Multilanguage::isEnabled()) :
-                                    ?>
-                                   <td class="small d-none d-md-table-cell">
-                                        <?php echo LayoutHelper::render('joomla.content.language', $item); ?>
-                                    </td>
-                                    <?php
-                                endif; ?>
-                              <td class="d-none d-md-table-cell">
-                                    <?php echo (int) $item->id; ?>
-                             </td>
-                          </tr>
-                            <?php
-                        endforeach; ?>
-                     </tbody>
-                   </table>
-
-                    <?php // Load the pagination. ?>
-                    <?php echo $this->pagination->getListFooter(); ?>
-
-                    <?php // Load the batch processing form. ?>
-                    <?php if (
-                    $user->authorise('core.create', 'com_weblinks')
-                        && $user->authorise('core.edit', 'com_weblinks')
-                        && $user->authorise('core.edit.state', 'com_weblinks')
-) :
-    ?>
-                        <?php echo HTMLHelper::_('bootstrap.renderModal', 'collapseModal', [
-                                'title' => Text::_('COM_WEBLINKS_BATCH_OPTIONS'),
-                                'footer' => $this->loadTemplate('batch_footer')
-                            ], $this->loadTemplate('batch_body')); ?>
-                    <?php
-                    endif; ?>
-                    <?php
-                endif; ?>
-
-             <input type="hidden" name="task" value="">
-             <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
-           </div>
-     </div>
- </div>
-</form>

src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_body.php

@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Layout\LayoutHelper;
-$published = $this->state->get('filter.published');
-?>
-
-<div class="p-3">
-  <div class="row">
-        <?php if (Multilanguage::isEnabled()) :
-            ?>
-           <div class="form-group col-md-6">
-              <div class="controls">
-                    <?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
-               </div>
-         </div>
-            <?php
-        endif; ?>
-     <div class="form-group col-md-6">
-          <div class="controls">
-                <?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
-         </div>
-     </div>
- </div>
- <div class="row">
-        <?php if ($published >= 0) :
-            ?>
-          <div class="form-group col-md-6">
-              <div class="controls">
-                    <?php echo LayoutHelper::render('joomla.html.batch.item', ['extension' => 'com_weblinks']); ?>
-              </div>
-         </div>
-            <?php
-        endif; ?>
-     <div class="form-group col-md-6">
-          <div class="controls">
-                <?php echo LayoutHelper::render('joomla.html.batch.tag', []); ?>
-            </div>
-     </div>
- </div>
-</div>

src/administrator/components/com_weblinks/tmpl/weblinks/default_batch_footer.php

@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Language\Text;
-
-?>
-<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
-    <?php echo Text::_('JCANCEL'); ?>
-</button>
-<button type="submit" id='batch-submit-button-id' class="btn btn-success" onclick="Joomla.submitbutton('weblink.batch');return false;">
-    <?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
-</button>

src/administrator/components/com_weblinks/tmpl/weblinks/emptystate.php

@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  Weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Factory;
-use Joomla\CMS\Layout\LayoutHelper;
-$displayData = [
-    'textPrefix' => 'COM_WEBLINKS',
-    'formURL'    => 'index.php?option=com_weblinks',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Weblinks',
-    'icon'       => 'icon-globe weblink',
-];
-$user = Factory::getApplication()->getIdentity();
-if ($user->authorise('core.create', 'com_weblinks') || count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0) {
-    $displayData['createURL'] = 'index.php?option=com_weblinks&task=weblink.add';
-}
-
-echo LayoutHelper::render('joomla.content.emptystate', $displayData);

src/administrator/components/com_weblinks/tmpl/weblinks/modal.php

@@ -1,166 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_weblinks
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\Component\Weblinks\Site\Helper\RouteHelper;
-$app = Factory::getApplication();
-if ($app->isClient('site')) {
-    Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
-}
-
-HTMLHelper::_('behavior.multiselect');
-$this->document->getWebAssetManager()
-    ->registerAndUseScript('com_weblinks.admin-weblinks-modal', 'media/com_weblinks/js/admin-weblinks-modal.js', [], ['defer' => true], ['core']);
-$function  = $app->input->getCmd('function', 'jSelectWeblink');
-$editor    = $app->input->getCmd('editor', '');
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDirn  = $this->escape($this->state->get('list.direction'));
-$onclick   = $this->escape($function);
-$multilang = Multilanguage::isEnabled();
-if (!empty($editor)) {
-// This view is used also in com_menus. Load the xtd script only if the editor is set!
-    $this->document->addScriptOptions('xtd-weblinks', array('editor' => $editor));
-    $onclick = "jSelectWeblink";
-}
-
-$iconStates = array(
-    -2 => 'icon-trash',
-    0 => 'icon-unpublish',
-    1 => 'icon-publish',
-    2 => 'icon-archive',
-);
-
-?>
-<div class="container-popup">
-
-    <form action="<?php echo Route::_('index.php?option=com_weblinks&view=weblinks&layout=modal&tmpl=component&function=' . $function . '&' . Session::getFormToken() . '=1&editor=' . $editor); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
-
-    <?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
-
-        <?php if (empty($this->items)) :
-            ?>
-          <div class="alert alert-no-items">
-                <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-           </div>
-            <?php
-        else :
-            ?>
-         <table class="table table-sm">
-             <caption class="visually-hidden">
-                <?php echo Text::_('COM_WEBLINKS_WEBLINKS_TABLE_CAPTION'); ?>,
-                    <span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
-                    <span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
-              </caption>
-             <thead>
-                    <tr>
-                       <th scope="col" class="w-1 text-center">
-                            <?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
-                     </th>
-                      <th scope="col" class="title">
-                            <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
-                     </th>
-                      <th scope="col" class="w-10 d-none d-md-table-cell">
-                            <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
-                       </th>
-                        <?php if ($multilang) :
-                            ?>
-                           <th scope="col" class="w-15">
-                                <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
-                            </th>
-                            <?php
-                        endif; ?>
-                      <th scope="col" class="w-10 d-none d-md-table-cell">
-                            <?php echo HTMLHelper::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
-                     </th>
-                      <th scope="col" class="w-1 d-none d-md-table-cell">
-                        <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
-                        </th>
-                  </tr>
-              </thead>
-               <tbody>
-                <?php foreach ($this->items as $i => $item) :
-                    ?>
-                    <?php $lang = ''; ?>
-                    <?php if ($item->language && $multilang) :
-                        ?>
-                        <?php $tag = strlen($item->language); ?>
-                        <?php if ($tag == 5) :
-                            ?>
-                            <?php $lang = substr($item->language, 0, 2); ?>
-                            <?php
-                        elseif ($tag == 6) :
-                            ?>
-                            <?php $lang = substr($item->language, 0, 3); ?>
-                            <?php
-                        endif; ?>
-                        <?php
-                    endif; ?>
-                    <tr class="row<?php echo $i % 2; ?>">
-                     <td class="center">
-                            <span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
-                      </td>
-                      <th scope="row">
-                            <?php $attribs = 'data-function="' . $this->escape($onclick) . '"'
-                                . ' data-id="' . $item->id . '"'
-                                . ' data-title="' . $this->escape(addslashes($item->title)) . '"'
-                                . ' data-cat-id="' . $this->escape($item->catid) . '"'
-                                . ' data-uri="' . $this->escape(RouteHelper::getWeblinkRoute($item->id, $item->catid, $item->language)) . '"'
-                                . ' data-language="' . $this->escape($lang) . '"';
-                            ?>
-                            <a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
-                                <?php echo $this->escape($item->title); ?>
-                         </a>
-                           <div class="small">
-                                <?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
-                          </div>
-                     </th>
-                      <td class="small d-none d-md-table-cell">
-                            <?php echo $this->escape($item->access_level); ?>
-                        </td>
-                        <?php if ($multilang) :
-                            ?>
-                           <td class="small">
-                                <?php echo LayoutHelper::render('joomla.content.language', $item); ?>
-                           </td>
-                            <?php
-                        endif; ?>
-                      <td class="small d-none d-md-table-cell">
-                            <?php echo HTMLHelper::_('date', $item->created, Text::_('DATE_FORMAT_LC4')); ?>
-                     </td>
-                      <td class="small d-none d-md-table-cell">
-                            <?php echo (int) $item->id; ?>
-                       </td>
-                  </tr>
-                    <?php
-                endforeach; ?>
-             </tbody>
-           </table>
-            <?php
-        endif; ?>
-
-        <?php // load the pagination. ?>
-        <?php echo $this->pagination->getListFooter(); ?>
-
-      <input type="hidden" name="task" value="" />
-       <input type="hidden" name="boxchecked" value="0" />
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>" />
-        <?php echo HTMLHelper::_('form.token'); ?>
-
- </form>
-</div>

src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select', null, array('disable_search_threshold' => 0 ));
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+$assoc = JLanguageAssociations::isEnabled();
+
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('details', 'images', 'item_associations', 'jmetadata');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'weblink.cancel' || document.formvalidator.isValid(document.getElementById('weblink-form'))) {
+			" . $this->form->getField('description')->save() . "
+			Joomla.submitform(task, document.getElementById('weblink-form'));
+		}
+	};
+");
+
+// In case of modal
+$isModal = $input->get('layout') == 'modal' ? true : false;
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_weblinks&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="weblink-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', empty($this->item->id) ? JText::_('COM_WEBLINKS_NEW_WEBLINK', true) : JText::_('COM_WEBLINKS_EDIT_WEBLINK', true)); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<div class="form-vertical">
+					<?php echo $this->form->renderField('url'); ?>
+					<?php echo $this->form->renderField('description'); ?>
+				</div>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'images', JText::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS', true)); ?>
+			<div class="row-fluid">
+				<div class="span6">
+					<?php echo $this->form->renderField('images'); ?>
+					<?php foreach ($this->form->getGroup('images') as $field) : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endforeach; ?>
+				</div>
+			</div>
+
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+		
+		<?php if (!$isModal && $assoc) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
+			<?php echo $this->loadTemplate('associations'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php elseif ($isModal && $assoc) : ?>
+			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>

src/administrator/components/com_weblinks/views/weblink/tmpl/edit_associations.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
@@ -8,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Layout\LayoutHelper;
-echo LayoutHelper::render('joomla.edit.associations', $this);
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);

src/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  Weblinks
@@ -8,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Layout\LayoutHelper;
-echo LayoutHelper::render('joomla.edit.metadata', $this);
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);

src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params'); ?>
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<div class="tab-pane" id="params-<?php echo $name; ?>">
+	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+		<?php echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>'; ?>
+	<?php endif; ?>
+	<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+		<div class="control-group">
+			<div class="control-label"><?php echo $field->label; ?></div>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php endforeach; ?>
+	</div>
+<?php endforeach; ?>

src/administrator/components/com_weblinks/views/weblink/tmpl/modal.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
@@ -7,17 +6,14 @@
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
+defined('_JEXEC') or die;
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-HTMLHelper::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
 // @deprecated 4.0 the function parameter, the inline js and the buttons are not needed since 3.7.0.
-$function  = Factory::getApplication()->input->getCmd('function', 'jEditWeblink_' . (int) $this->item->id);
+$function  = JFactory::getApplication()->input->getCmd('function', 'jEditWeblink_' . (int) $this->item->id);
+
 // Function to update input title when changed
-Factory::getDocument()->addScriptDeclaration('
+JFactory::getDocument()->addScriptDeclaration('
 	function jEditWeblinkModal() {
 		if (window.parent && document.formvalidator.isValid(document.getElementById("weblink-form"))) {
 			return window.parent.' . $this->escape($function) . '(document.getElementById("jform_title").value);
@@ -30,6 +26,6 @@ Factory::getDocument()->addScriptDeclaration('
 <button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('weblink.cancel');"></button>
 
 <div class="container-popup">
-    <?php $this->setLayout('edit'); ?>
-    <?php echo $this->loadTemplate(); ?>
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
 </div>

src/administrator/components/com_weblinks/views/weblink/tmpl/modal_associations.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
@@ -8,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Layout\LayoutHelper;
-echo LayoutHelper::render('joomla.edit.associations', $this);
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);

src/administrator/components/com_weblinks/views/weblink/tmpl/modal_metadata.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
@@ -8,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\CMS\Layout\LayoutHelper;
-echo LayoutHelper::render('joomla.edit.metadata', $this);
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);

src/administrator/components/com_weblinks/views/weblink/tmpl/modal_params.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params'); ?>
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<div class="tab-pane" id="params-<?php echo $name; ?>">
+	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+		<?php echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>'; ?>
+	<?php endif; ?>
+	<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+		<div class="control-group">
+			<div class="control-label"><?php echo $field->label; ?></div>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php endforeach; ?>
+	</div>
+<?php endforeach; ?>

src/administrator/components/com_weblinks/views/weblink/view.html.php

@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a weblink.
+ *
+ * @since  1.5
+ */
+class WeblinksViewWeblink extends JViewLegacy
+{
+	protected $state;
+
+	protected $item;
+
+	protected $form;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// If we are forcing a language in modal (used for associations).
+		if ($this->getLayout() === 'modal' && $forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd'))
+		{
+			// Set the language field to the forcedLanguage and disable changing it.
+			$this->form->setValue('language', null, $forcedLanguage);
+			$this->form->setFieldAttribute('language', 'readonly', 'true');
+
+			// Only allow to select categories with All language or with the forced language.
+			$this->form->setFieldAttribute('catid', 'language', '*,' . $forcedLanguage);
+
+			// Only allow to select tags with All language or with the forced language.
+			$this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+
+		// Since we don't track these assets at the item level, use the category id.
+		$canDo = JHelperContent::getActions('com_weblinks', 'category', $this->item->catid);
+
+		JToolbarHelper::title($isNew ? JText::_('COM_WEBLINKS_MANAGER_WEBLINK_NEW') : JText::_('COM_WEBLINKS_MANAGER_WEBLINK_EDIT'), 'link weblinks');
+
+		// If not checked out, can save the item.
+		if (!$checkedOut && ($canDo->get('core.edit')||(count($user->getAuthorisedCategories('com_weblinks', 'core.create')))))
+		{
+			JToolbarHelper::apply('weblink.apply');
+			JToolbarHelper::save('weblink.save');
+		}
+
+		if (!$checkedOut && (count($user->getAuthorisedCategories('com_weblinks', 'core.create'))))
+		{
+			JToolbarHelper::save2new('weblink.save2new');
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && (count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0))
+		{
+			JToolbarHelper::save2copy('weblink.save2copy');
+		}
+
+		if (JLanguageAssociations::isEnabled() && JComponentHelper::isEnabled('com_associations'))
+		{
+			JToolbarHelper::custom('weblink.editAssociations', 'contract', 'contract', 'JTOOLBAR_ASSOCIATIONS', false, false);
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('weblink.cancel');
+		}
+		else
+		{
+			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			{
+				JToolbarHelper::versions('com_weblinks.weblink', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('weblink.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS_EDIT');
+	}
+}

src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php

@@ -0,0 +1,187 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_weblinks.category');
+$saveOrder = $listOrder == 'a.ordering';
+$assoc     = JLanguageAssociations::isEnabled();
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_weblinks&task=weblinks.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'weblinkList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=weblinks'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<?php else : ?>
+	<div id="j-main-container">
+	<?php endif;?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="weblinkList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($assoc) : ?>
+						<th width="5%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_WEBLINKS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="8">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<?php $ordering       = ($listOrder == 'a.ordering'); ?>
+					<?php $item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_weblinks&task=edit&type=other&cid[]=' . $item->catid); ?>
+					<?php $canCreate      = $user->authorise('core.create',     'com_weblinks.category.' . $item->catid); ?>
+					<?php $canEdit        = $user->authorise('core.edit',       'com_weblinks.category.' . $item->catid); ?>
+					<?php $canCheckin     = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; ?>
+					<?php $canEditOwn     = $user->authorise('core.edit.own',   'com_weblinks.category.' . $item->catid) && $item->created_by == $user->id; ?>
+					<?php $canChange      = $user->authorise('core.edit.state', 'com_weblinks.category.' . $item->catid) && $canCheckin; ?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php $iconClass = ''; ?>
+							<?php if (!$canChange) : ?>
+								<?php $iconClass = ' inactive'; ?>
+							<?php elseif (!$saveOrder) : ?>
+								<?php $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); ?>
+							<?php endif; ?>
+							<span class="sortable-handler<?php echo $iconClass ?>">
+								<i class="icon-menu" aria-hidden="true"></i>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td class="center">
+							<div class="btn-group">
+								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'weblinks.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+								<?php // Create dropdown items and render the dropdown list. ?>
+								<?php if ($canChange) : ?>
+									<?php JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'weblinks'); ?>
+									<?php JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'weblinks'); ?>
+									<?php echo JHtml::_('actionsdropdown.render', $this->escape($item->title)); ?>
+								<?php endif; ?>
+							</div>
+						</td>
+						<td class="has-context">
+							<?php if ($item->checked_out) : ?>
+								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?>
+							<?php endif; ?>
+							<?php if ($canEdit || $canEditOwn) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id); ?>">
+									<?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+									<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>
+							<span class="small">
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+							</span>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="center hidden-phone">
+							<?php echo $item->hits; ?>
+						</td>
+						<?php if ($assoc) : ?>
+							<td class="hidden-phone hidden-tablet">
+								<?php if ($item->association) : ?>
+									<?php echo JHtml::_('weblink.association', $item->id); ?>
+								<?php endif; ?>
+							</td>
+						<?php endif; ?>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="center hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', 'com_content')
+				&& $user->authorise('core.edit', 'com_content')
+				&& $user->authorise('core.edit.state', 'com_content')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_WEBLINKS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>

src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_body.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.item', 'com_weblinks'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.tag'); ?>
+			</div>
+		</div>
+	</div>
+</div>

src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch_footer.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('weblink.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>

src/administrator/components/com_weblinks/views/weblinks/tmpl/modal.php

@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+JLoader::register('WeblinksHelperRoute', JPATH_ROOT . '/components/com_weblinks/helpers/route.php');
+
+// Include the component HTML helpers.
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+JHtml::_('behavior.core');
+JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
+JHtml::_('script', 'com_weblinks/admin-weblinks-modal.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$function  = $app->input->getCmd('function', 'jSelectWeblink');
+$editor    = $app->input->getCmd('editor', '');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$onclick   = $this->escape($function);
+
+if (!empty($editor))
+{
+	// This view is used also in com_menus. Load the xtd script only if the editor is set!
+	JFactory::getDocument()->addScriptOptions('xtd-weblinks', array('editor' => $editor));
+	$onclick = "jSelectWeblink";
+}
+
+$iconStates = array(
+	-2 => 'icon-trash',
+	0 => 'icon-unpublish',
+	1 => 'icon-publish',
+	2 => 'icon-archive',
+);
+
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=weblinks&layout=modal&tmpl=component&function=' . $function . '&' . JSession::getFormToken() . '=1&editor=' . $editor); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"></div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped table-condensed">
+				<thead>
+					<tr>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="6">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<?php $lang = ''; ?>
+					<?php if ($item->language && JLanguageMultilang::isEnabled()) : ?>
+						<?php $tag = strlen($item->language); ?>
+						<?php if ($tag == 5) : ?>
+							<?php $lang = substr($item->language, 0, 2); ?>
+						<?php elseif ($tag == 6) : ?>
+							<?php $lang = substr($item->language, 0, 3); ?>
+						<?php endif; ?>
+					<?php endif; ?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
+						</td>
+						<td>
+							<?php $attribs = 'data-function="' . $this->escape($onclick) . '"'
+								. ' data-id="' . $item->id . '"'
+								. ' data-title="' . $this->escape(addslashes($item->title)) . '"'
+								. ' data-cat-id="' . $this->escape($item->catid) . '"'
+								. ' data-uri="' . $this->escape(WeblinksHelperRoute::getWeblinkRoute($item->id, $item->catid, $item->language)) . '"'
+								. ' data-language="' . $this->escape($lang) . '"';
+							?>
+							<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+								<?php echo $this->escape($item->title); ?>
+							</a>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="small">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>

src/administrator/components/com_weblinks/views/weblinks/view.html.php

@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of weblinks.
+ *
+ * @since  1.5
+ */
+class WeblinksViewWeblinks extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Modal layout doesn't need the submenu.
+		if ($this->getLayout() !== 'modal')
+		{
+			WeblinksHelper::addSubmenu('weblinks');
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal layout.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In article associations modal we need to remove language filter if forcing a language.
+			// We also need to change the category filter to show show categories with All or the forced language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+
+				// One last changes needed is to change the category filter to just show categories with All language or with the forced language.
+				$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/weblinks.php';
+
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_weblinks', 'category', $state->get('filter.category_id'));
+		$user  = JFactory::getUser();
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		JToolbarHelper::title(JText::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks');
+
+		if (count($user->getAuthorisedCategories('com_weblinks', 'core.create')) > 0)
+		{
+			JToolbarHelper::addNew('weblink.add');
+		}
+
+		if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+		{
+			JToolbarHelper::editList('weblink.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('weblinks.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('weblinks.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+
+			JToolbarHelper::archiveList('weblinks.archive');
+			JToolbarHelper::checkin('weblinks.checkin');
+		}
+
+		if ($state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'weblinks.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('weblinks.trash');
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_weblinks') && $user->authorise('core.edit', 'com_weblinks')
+			&& $user->authorise('core.edit.state', 'com_weblinks'))
+		{
+			JHtml::_('bootstrap.renderModal', 'collapseModal');
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($user->authorise('core.admin', 'com_weblinks') || $user->authorise('core.options', 'com_weblinks'))
+		{
+			JToolbarHelper::preferences('com_weblinks');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_WEBLINKS_LINKS');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state' => JText::_('JSTATUS'),
+			'a.title' => JText::_('JGLOBAL_TITLE'),
+			'a.access' => JText::_('JGRID_HEADING_ACCESS'),
+			'a.hits' => JText::_('JGLOBAL_HITS'),
+			'a.language' => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id' => JText::_('JGRID_HEADING_ID')
+		);
+	}
+}

src/administrator/components/com_weblinks/weblinks.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_weblinks'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller	= JControllerLegacy::getInstance('Weblinks');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();

src/administrator/components/com_weblinks/weblinks.xml

@@ -1,69 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<extension type="component" version="3.5" method="upgrade">
-	<name>com_weblinks</name>
-	<element>com_weblinks</element>
-	<author>Joomla! Project</author>
-	<creationDate>##DATE##</creationDate>
-	<copyright>(C) 2005 - ##YEAR## Open Source Matters. All rights reserved.</copyright>
-	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<authorEmail>admin@joomla.org</authorEmail>
-	<authorUrl>www.joomla.org</authorUrl>
-	<version>##VERSION##</version>
-	<description>COM_WEBLINKS_XML_DESCRIPTION</description>
-	<scriptfile>script.php</scriptfile>
-	<namespace path="src">Joomla\Component\Weblinks</namespace>
-
-	<install>
-		<sql>
-			<file charset="utf8" driver="mysql">sql/install.mysql.sql</file>
-			<file charset="utf8" driver="postgresql">sql/install.postgresql.sql</file>
-		</sql>
-	</install>
-	<uninstall>
-		<sql>
-			<file charset="utf8" driver="mysql">sql/uninstall.mysql.sql</file>
-			<file charset="utf8" driver="postgresql">sql/uninstall.postgresql.sql</file>
-		</sql>
-	</uninstall>
-	<update>
-		<schemas>
-			<schemapath type="mysql">sql/updates/mysql</schemapath>
-			<schemapath type="postgresql">sql/updates/postgresql</schemapath>
-		</schemas>
-	</update>
-
-	<media folder="media/com_weblinks" destination="com_weblinks">
-		##MEDIA_FILES##
-	</media>
-
-	<files folder="components/com_weblinks">
-		##FRONTEND_COMPONENT_FILES##
-	</files>
-	<languages folder="language">
-		##FRONTEND_LANGUAGE_FILES##
-	</languages>
-	<administration>
-		<menu img="class:weblinks">com_weblinks</menu>
-		<submenu>
-			<!--
-				Note that all & must be escaped to &amp; for the file to be valid
-				XML and be parsed by the installer
-			-->
-			<menu link="option=com_weblinks" view="links" img="class:weblinks"
-				alt="Weblinks/Links">com_weblinks_links</menu>
-			<menu link="option=com_categories&amp;extension=com_weblinks"
-				view="categories" img="class:weblinks-cat" alt="Weblinks/Categories">com_weblinks_categories</menu>
-			<menu link="option=com_fields&amp;view=fields&amp;context=com_weblinks.weblink"
-				  alt="Weblinks/Fields">com_weblinks_fields</menu>
-			<menu link="option=com_fields&amp;view=groups&amp;context=com_weblinks.weblink"
-				  alt="Weblinks/Field Groups">com_weblinks_field_groups</menu>
-		</submenu>
-		<files folder="administrator/components/com_weblinks">
-			##BACKEND_COMPONENT_FILES##
-		</files>
-		<languages folder="administrator/language">
-			##BACKEND_LANGUAGE_FILES##
-		</languages>
-	</administration>
-</extension>
-
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.5" method="upgrade">
+	<name>com_weblinks</name>
+	<author>Joomla! Project</author>
+	<creationDate>##DATE##</creationDate>
+	<copyright>(C) 2005 - ##YEAR## Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>##VERSION##</version>
+	<description>COM_WEBLINKS_XML_DESCRIPTION</description>
+	<scriptfile>script.php</scriptfile>
+
+	<install>
+		<sql>
+			<file charset="utf8" driver="mysql">sql/install.mysql.sql</file>
+			<file charset="utf8" driver="postgresql">sql/install.postgresql.sql</file>
+			<file charset="utf8" driver="sqlsrv">sql/install.sqlsrv.sql</file>
+		</sql>
+	</install>
+	<uninstall>
+		<sql>
+			<file charset="utf8" driver="mysql">sql/uninstall.mysql.sql</file>
+			<file charset="utf8" driver="postgresql">sql/uninstall.postgresql.sql</file>
+			<file charset="utf8" driver="sqlsrv">sql/uninstall.sqlsrv.sql</file>
+		</sql>
+	</uninstall>
+	<update>
+		<schemas>
+			<schemapath type="mysql">sql/updates/mysql</schemapath>
+			<schemapath type="postgresql">sql/updates/postgresql</schemapath>
+			<schemapath type="sqlsrv">sql/updates/sqlsrv</schemapath>
+		</schemas>
+	</update>
+
+	<media folder="media/com_weblinks" destination="com_weblinks">
+		##MEDIA_FILES##
+	</media>
+
+	<files folder="components/com_weblinks">
+		##FRONTEND_COMPONENT_FILES##
+	</files>
+	<languages folder="language">
+		##FRONTEND_LANGUAGE_FILES##
+	</languages>
+	<administration>
+		<menu img="class:weblinks">com_weblinks</menu>
+		<submenu>
+			<!--
+				Note that all & must be escaped to &amp; for the file to be valid
+				XML and be parsed by the installer
+			-->
+			<menu link="option=com_weblinks" view="links" img="class:weblinks"
+				alt="Weblinks/Links">com_weblinks_links</menu>
+			<menu link="option=com_categories&amp;extension=com_weblinks"
+				view="categories" img="class:weblinks-cat" alt="Weblinks/Categories">com_weblinks_categories</menu>
+		</submenu>
+		<files folder="administrator/components/com_weblinks">
+			##BACKEND_COMPONENT_FILES##
+		</files>
+		<languages folder="administrator/language">
+			##BACKEND_LANGUAGE_FILES##
+		</languages>
+	</administration>
+</extension>
+

src/administrator/language/en-GB/com_weblinks.ini

@@ -1,93 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-COM_WEBLINKS="Web Links"
-COM_WEBLINKS_BATCH_OPTIONS="Batch process the selected links"
-COM_WEBLINKS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved links. Otherwise, all actions are applied to the selected links."
-COM_WEBLINKS_CATEGORIES_DESC="These settings apply for Web Links Categories Options unless they are changed for a specific menu item."
-COM_WEBLINKS_CATEGORY_DESC="These settings apply for Web Links Category Options unless they are changed for a specific menu item."
-COM_WEBLINKS_CHANGE_WEBLINK="Select or Change Web Link"
-COM_WEBLINKS_COMPONENT_DESC="These settings apply for Web Links unless they are changed for a specific menu item or Web Link."
-COM_WEBLINKS_COMPONENT_LABEL="Web Link"
-COM_WEBLINKS_CONFIGURATION="Web Links Manager Options"
-COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Web Links Component will integrate with other extensions."
-COM_WEBLINKS_EDIT_WEBLINK="Edit Web Link"
-COM_WEBLINKS_EMPTYSTATE_BUTTON_ADD="Add your first Web Link"
-COM_WEBLINKS_EMPTYSTATE_CONTENT="Add, edit and remove links to other web sites on your Joomla! web site, and organize them into categories. You can then display these links on your site, and optionally let visitors add new links."
-COM_WEBLINKS_EMPTYSTATE_TITLE="No Web Links have been created yet."
-COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another Web Link from this category has the same alias (remember it may be a trashed item)."
-COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again."
-COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL"
-COM_WEBLINKS_ERR_TABLES_TITLE="Your Web Link must contain a title."
-COM_WEBLINKS_FIELDSET_OPTIONS="Options"
-COM_WEBLINKS_FIELD_CAPTCHA_LABEL="Allow Captcha on Web Link"
-COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Web Links"
-COM_WEBLINKS_FIELD_CONFIG_ICON_DESC="If Icon is chosen above, select an icon to display with the Web Links. If none is selected, the default icon will be used."
-COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL="Select Icon"
-COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL="Links Description"
-COM_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."
-COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL="Count Clicks"
-COM_WEBLINKS_FIELD_FIRST_LABEL="First Image"
-COM_WEBLINKS_FIELD_HEIGHT_LABEL="Height"
-COM_WEBLINKS_FIELD_ICON_DESC="Displays a text, an icon or nothing with the Web links. Default is 'Icon'."
-COM_WEBLINKS_FIELD_ICON_LABEL="Text/Icon/Web Link Only"
-COM_WEBLINKS_FIELD_ICON_OPTION_ICON="Icon"
-COM_WEBLINKS_FIELD_ICON_OPTION_TEXT="Text"
-COM_WEBLINKS_FIELD_ICON_OPTION_WEBLINK="Web Link Only"
-COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC="Decorative Image - no description required"
-COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL="No Description"
-COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL="Alt Text"
-COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption"
-COM_WEBLINKS_FIELD_MODIFIED_DESC="The date and time the link was last modified."
-COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image"
-COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a Category"
-COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Category Tags"
-COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Tags"
-COM_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected."
-COM_WEBLINKS_FIELD_TARGET_LABEL="Target"
-COM_WEBLINKS_FIELD_URL_LABEL="URL"
-COM_WEBLINKS_FIELD_VALUE_REPORTED="Reported"
-COM_WEBLINKS_FIELD_VERSION_LABEL="Revision"
-COM_WEBLINKS_FIELD_WIDTH_LABEL="Width"
-COM_WEBLINKS_FILTER_SEARCH_DESC="Search in Web Link title and alias. Prefix with ID: to search for a Web Link ID."
-COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links"
-COM_WEBLINKS_FILTER_STATE="Filter State"
-COM_WEBLINKS_FLOAT_FIRST_LABEL="First Image Float"
-COM_WEBLINKS_FLOAT_SECOND_LABEL="Second Image Float"
-COM_WEBLINKS_HEADING_ASSOCIATION="Association"
-COM_WEBLINKS_LEFT="Left"
-COM_WEBLINKS_LIST_LAYOUT_DESC="These settings apply for Web Links List Layout Options unless they are changed for a specific menu item."
-COM_WEBLINKS_MANAGER_WEBLINK="Web Links"
-COM_WEBLINKS_MANAGER_WEBLINKS="Web Links"
-COM_WEBLINKS_MANAGER_WEBLINK_EDIT="Web Link: Edit"
-COM_WEBLINKS_MANAGER_WEBLINK_NEW="Web Link: New"
-COM_WEBLINKS_NEW_WEBLINK="New Web Link"
-COM_WEBLINKS_NONE="None"
-COM_WEBLINKS_N_ITEMS_ARCHIVED="%d Web Links archived."
-COM_WEBLINKS_N_ITEMS_ARCHIVED_1="%d Web Link archived."
-COM_WEBLINKS_N_ITEMS_CHECKED_IN_0="No Web Link checked in."
-COM_WEBLINKS_N_ITEMS_CHECKED_IN_1="%d Web Link checked in."
-COM_WEBLINKS_N_ITEMS_CHECKED_IN_MORE="%d Web Links checked in."
-COM_WEBLINKS_N_ITEMS_DELETED="%d Web Links deleted."
-COM_WEBLINKS_N_ITEMS_DELETED_1="%d Web Link deleted."
-COM_WEBLINKS_N_ITEMS_PUBLISHED="%d Web Links published."
-COM_WEBLINKS_N_ITEMS_PUBLISHED_1="%d Web Link published."
-COM_WEBLINKS_N_ITEMS_TRASHED="%d Web Links trashed."
-COM_WEBLINKS_N_ITEMS_TRASHED_1="%d Web Link trashed."
-COM_WEBLINKS_N_ITEMS_UNPUBLISHED="%d Web Links unpublished."
-COM_WEBLINKS_N_ITEMS_UNPUBLISHED_1="%d Web Link unpublished."
-COM_WEBLINKS_OPTIONS="Options"
-COM_WEBLINKS_RIGHT="Right"
-COM_WEBLINKS_SAVE_SUCCESS="Web link saved"
-COM_WEBLINKS_SELECT_A_WEBLINK="Select Web Link"
-COM_WEBLINKS_SUBMENU_CATEGORIES="Categories"
-COM_WEBLINKS_SUBMENU_WEBLINKS="Web Links"
-COM_WEBLINKS_WEBLINKS="Web Links"
-COM_WEBLINKS_XML_DESCRIPTION="Component for Web Links management"
-JGLOBAL_NEWITEMSLAST_DESC="New Web links default to the last position. Ordering can be changed after this Web link is saved."
-JGLOBAL_NO_ITEM_SELECTED="No Web Links selected"
-JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new Web Links in this category."
-JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these Web Links."
-JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."

src/administrator/language/en-GB/en-GB.com_weblinks.ini

@@ -0,0 +1,133 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_WEBLINKS="Web Links"
+COM_WEBLINKS_ACCESS_HEADING="Access"
+COM_WEBLINKS_BATCH_OPTIONS="Batch process the selected links"
+COM_WEBLINKS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved links. Otherwise, all actions are applied to the selected links."
+COM_WEBLINKS_CATEGORIES_DESC="These settings apply for Web Links Categories Options unless they are changed for a specific menu item."
+COM_WEBLINKS_CATEGORY_DESC="These settings apply for Web Links Category Options unless they are changed for a specific menu item."
+COM_WEBLINKS_CHANGE_WEBLINK="Select or Change Web Link"
+COM_WEBLINKS_COMPONENT_DESC="These settings apply for Web Links unless they are changed for a specific menu item or web link."
+COM_WEBLINKS_COMPONENT_LABEL="Web Link"
+COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Web Links Component will integrate with other extensions."
+COM_WEBLINKS_CONFIGURATION="Web Links Manager Options"
+COM_WEBLINKS_EDIT_WEBLINK="Edit Web Link"
+COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again."
+COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL"
+COM_WEBLINKS_ERR_TABLES_TITLE="Your web link must contain a title."
+COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another web link from this category has the same alias (remember it may be a trashed item)."
+COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category."
+COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this Web link."
+COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a Web Links category to display."
+COM_WEBLINKS_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the web link submit form. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration."
+COM_WEBLINKS_FIELD_CAPTCHA_LABEL="Allow Captcha on Web Link"
+COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Show or hide the number of Web Links in each Category."
+COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Web Links"
+COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."
+COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_LABEL="Count Clicks"
+COM_WEBLINKS_FIELD_CONFIG_DESCRIPTION_DESC="Show or hide the description below."
+COM_WEBLINKS_FIELD_CONFIG_HITS_DESC="Show or hide hits."
+COM_WEBLINKS_FIELD_CONFIG_ICON_DESC="If Icon is chosen above, select an icon to display with the Web Links. If none is selected, the default icon will be used."
+COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL="Select Icon"
+COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC="Show or hide the links description."
+COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL="Links Description"
+COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_DESC="Show or hide other categories."
+COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_LABEL="Other Categories"
+COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_DESC="Show or hide the Report Bad Link option."
+COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_LABEL="Reports"
+COM_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."
+COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL="Count Clicks"
+COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for the web link."
+COM_WEBLINKS_FIELD_DISPLAY_NUM_DESC="Default number of Web links to list on a page."
+COM_WEBLINKS_FIELD_DISPLAY_NUM_LABEL="# of Web links to List"
+COM_WEBLINKS_FIELD_FIRST_DESC="The image to be displayed."
+COM_WEBLINKS_FIELD_FIRST_LABEL="First Image"
+
+COM_WEBLINKS_FIELD_HEIGHT_DESC="Height of the target popup or modal window. Defaults to 600x500 if one field is left empty."
+COM_WEBLINKS_FIELD_HEIGHT_LABEL="Height"
+COM_WEBLINKS_FIELD_ICON_DESC="Displays a text, an icon or nothing with the Web links. Default is 'Icon'."
+COM_WEBLINKS_FIELD_ICON_LABEL="Text/Icon/Web Link Only"
+COM_WEBLINKS_FIELD_ICON_OPTION_ICON="Icon"
+COM_WEBLINKS_FIELD_ICON_OPTION_TEXT="Text"
+COM_WEBLINKS_FIELD_ICON_OPTION_WEBLINK="Web Link Only"
+COM_WEBLINKS_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images. Replaced with caption text if it is present."
+COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL="Alt Text"
+COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image."
+COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption"
+
+COM_WEBLINKS_FIELD_LANGUAGE_DESC="Assign a language to this web link."
+COM_WEBLINKS_FIELD_MODIFIED_DESC="The date and time the link was last modified."
+COM_WEBLINKS_FIELD_SECOND_DESC="The second image to be displayed."
+COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image"
+COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC="Select a web links category to display."
+COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a Category"
+COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for a category."
+COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Category Tags"
+COM_WEBLINKS_FIELD_SHOW_TAGS_DESC="Show the tags for a web link."
+COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Tags"
+COM_WEBLINKS_FIELD_STATE_DESC="Set publication status."
+COM_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected."
+COM_WEBLINKS_FIELD_TARGET_LABEL="Target"
+COM_WEBLINKS_FIELD_TITLE_DESC="Web Link must have a title."
+COM_WEBLINKS_FIELD_URL_DESC="You must enter a URL. IDN (International) Links are converted to punycode when they are saved."
+COM_WEBLINKS_FIELD_URL_LABEL="URL"
+COM_WEBLINKS_FIELD_VALUE_REPORTED="Reported"
+COM_WEBLINKS_FIELD_VERSION_DESC="A count of the number of times this web link has been revised."
+COM_WEBLINKS_FIELD_VERSION_LABEL="Revision"
+COM_WEBLINKS_FIELD_WIDTH_DESC="Width of the target popup or modal window. Defaults to 600x500 if one field is left empty."
+COM_WEBLINKS_FIELD_WIDTH_LABEL="Width"
+COM_WEBLINKS_FIELDSET_IMAGES="Images"
+COM_WEBLINKS_FIELDSET_OPTIONS="Options"
+COM_WEBLINKS_FILTER_CATEGORY="Filter Category"
+COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for a web link ID."
+COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links"
+COM_WEBLINKS_FILTER_STATE="Filter State"
+COM_WEBLINKS_FLOAT_FIRST_DESC="Controls placement of the first image."
+COM_WEBLINKS_FLOAT_FIRST_LABEL="First Image Float"
+COM_WEBLINKS_FLOAT_SECOND_DESC="Controls placement of the second image."
+COM_WEBLINKS_FLOAT_SECOND_LABEL="Second Image Float"
+COM_WEBLINKS_HEADING_ASSOCIATION="Association"
+COM_WEBLINKS_HITS_DESC="Number of hits for this web link."
+COM_WEBLINKS_LEFT="Left"
+COM_WEBLINKS_LIST_LAYOUT_DESC="These settings apply for Web Links List Layout Options unless they are changed for a specific menu item."
+COM_WEBLINKS_MANAGER_WEBLINK="Web Links"
+COM_WEBLINKS_MANAGER_WEBLINKS="Web Links"
+COM_WEBLINKS_MANAGER_WEBLINK_EDIT="Web Link: Edit"
+COM_WEBLINKS_MANAGER_WEBLINK_NEW="Web Link: New"
+COM_WEBLINKS_N_ITEMS_ARCHIVED="%d web links successfully archived."
+COM_WEBLINKS_N_ITEMS_ARCHIVED_1="%d web link successfully archived."
+COM_WEBLINKS_N_ITEMS_CHECKED_IN_0="No web link successfully checked in."
+COM_WEBLINKS_N_ITEMS_CHECKED_IN_1="%d web link successfully checked in."
+COM_WEBLINKS_N_ITEMS_CHECKED_IN_MORE="%d web links successfully checked in."
+COM_WEBLINKS_N_ITEMS_DELETED="%d web links successfully deleted."
+COM_WEBLINKS_N_ITEMS_DELETED_1="%d web link successfully deleted."
+COM_WEBLINKS_N_ITEMS_PUBLISHED="%d web links successfully published."
+COM_WEBLINKS_N_ITEMS_PUBLISHED_1="%d web link successfully published."
+COM_WEBLINKS_N_ITEMS_TRASHED="%d web links successfully trashed."
+COM_WEBLINKS_N_ITEMS_TRASHED_1="%d web link successfully trashed."
+COM_WEBLINKS_N_ITEMS_UNPUBLISHED="%d web links successfully unpublished."
+COM_WEBLINKS_N_ITEMS_UNPUBLISHED_1="%d web link successfully unpublished."
+COM_WEBLINKS_NEW_WEBLINK="New Web Link"
+COM_WEBLINKS_NONE="None"
+COM_WEBLINKS_OPTION_FILTER_ACCESS="- Filter Access -"
+COM_WEBLINKS_OPTION_FILTER_CATEGORY="- Filter Category -"
+COM_WEBLINKS_OPTION_FILTER_PUBLISHED="- Filter State -"
+COM_WEBLINKS_OPTIONS="Options"
+COM_WEBLINKS_ORDER_HEADING="Order"
+COM_WEBLINKS_RIGHT="Right"
+COM_WEBLINKS_SAVE_SUCCESS="Web link successfully saved"
+COM_WEBLINKS_SEARCH_IN_TITLE="Search in title"
+COM_WEBLINKS_SELECT_A_WEBLINK="Select Web Link"
+COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no Web links or subcategories."
+COM_WEBLINKS_SUBMENU_CATEGORIES="Categories"
+COM_WEBLINKS_SUBMENU_WEBLINKS="Web Links"
+COM_WEBLINKS_WEBLINKS="Web Links"
+COM_WEBLINKS_XML_DESCRIPTION="Component for web links management"
+JGLOBAL_NO_ITEM_SELECTED="No web links selected"
+JGLOBAL_NEWITEMSLAST_DESC="New Web links default to the last position. Ordering can be changed after this Web link is saved."
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new web links in this category."
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these web links."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."

src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini

@@ -15,12 +15,11 @@ COM_WEBLINKS_CATEGORY_VIEW_DEFAULT_OPTION="Default"
 COM_WEBLINKS_CATEGORY_VIEW_DEFAULT_TITLE="List Web Links in a Category"
 COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link"
 COM_WEBLINKS_CONTENT_TYPE_CATEGORY="Web Links Category"
+COM_WEBLINKS_FIELD_SELECT_WEBLINK_DESC="Select the desired Web link from the list."
 COM_WEBLINKS_FIELD_SELECT_WEBLINK_LABEL="Select Weblink"
 COM_WEBLINKS_FORM_VIEW_DEFAULT_DESC="Display a form to submit a web link in the Frontend."
 COM_WEBLINKS_FORM_VIEW_DEFAULT_OPTION="Default"
 COM_WEBLINKS_FORM_VIEW_DEFAULT_TITLE="Submit a Web Link"
-COM_WEBLINKS_FIELDS="Fields"
-COM_WEBLINKS_FIELD_GROUPS="Field Groups"
 COM_WEBLINKS_LINKS="Links"
 COM_WEBLINKS_TAGS_WEBLINK="Web Link"
 COM_WEBLINKS_TAGS_CATEGORY="Web Link Category"

src/administrator/manifests/packages/pkg_weblinks.xml

@@ -21,10 +21,10 @@
 		<file type="plugin" id="weblinks" group="finder">plg_finder_weblinks.zip</file>
 		<file type="plugin" id="weblinks" group="search">plg_search_weblinks.zip</file>
 		<file type="plugin" id="weblinks" group="system">plg_system_weblinks.zip</file>
-		<file type="plugin" id="weblink" group="editors-xtd">plg_editors-xtd_weblink.zip</file>
+		<file type="plugin" id="weblinks" group="editors-xtd">plg_editors-xtd_weblink.zip</file>
 	</files>
 	<languages folder="language">
-		<language tag="en-GB">en-GB/pkg_weblinks.sys.ini</language>
+		<language tag="en-GB">en-GB/en-GB.pkg_weblinks.sys.ini</language>
 	</languages>
 	<updateservers>
 		<!-- Note: No spaces or linebreaks allowed between the server tags -->

src/administrator/manifests/packages/weblinks/script.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Administrator
  * @subpackage  Weblinks
@@ -8,27 +7,23 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-use Joomla\CMS\Installer\InstallerScript;
+defined('_JEXEC') or die;
 
 /**
  * Installation class to perform additional changes during install/uninstall/update
  *
  * @since  __DEPLOY_VERSION__
  */
-class Pkg_WeblinksInstallerScript extends InstallerScript
+class Pkg_WeblinksInstallerScript extends JInstallerScript
 {
-    /**
-     * Extension script constructor.
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function __construct()
-    {
-        $this->minimumJoomla = '4.3.0';
-        $this->minimumPhp    = JOOMLA_MINIMUM_PHP;
-    }
+	/**
+	 * Extension script constructor.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct()
+	{
+		$this->minimumJoomla = '3.6.3';
+		$this->minimumPhp    = JOOMLA_MINIMUM_PHP;
+	}
 }

src/components/com_weblinks/controller.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Weblinks Component Controller
+ *
+ * @since  1.5
+ */
+class WeblinksController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cacheable  If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types,
+	 *                               for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  WeblinksController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cacheable = false, $urlparams = false)
+	{
+		// Huh? Why not just put that in the constructor?
+		$cacheable = true;
+
+		/**
+		 * Set the default view name and format from the Request.
+		 * Note we are using w_id to avoid collisions with the router and the return page.
+		 * Frontend is a bit messier than the backend.
+		 */
+		$id    = $this->input->getInt('w_id');
+		$vName = $this->input->get('view', 'categories');
+		$this->input->set('view', $vName);
+
+		if (JFactory::getUser()->id ||($this->input->getMethod() == 'POST' && $vName == 'categories'))
+		{
+			$cacheable = false;
+		}
+
+		$safeurlparams = array(
+			'id'               => 'INT',
+			'limit'            => 'UINT',
+			'limitstart'       => 'UINT',
+			'filter_order'     => 'CMD',
+			'filter_order_Dir' => 'CMD',
+			'lang'             => 'CMD'
+		);
+
+		// Check for edit form.
+		if ($vName == 'form' && !$this->checkEditId('com_weblinks.edit.weblink', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			return JError::raiseError(403, JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+		}
+
+		return parent::display($cacheable, $safeurlparams);
+	}
+}

src/components/com_weblinks/controllers/weblink.php

@@ -0,0 +1,313 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Weblinks class.
+ *
+ * @since  1.5
+ */
+class WeblinksControllerWeblink extends JControllerForm
+{
+	/**
+	 * The URL view item variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_item = 'form';
+
+	/**
+	 * The URL view list variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_list = 'categories';
+
+	/**
+	 * The URL edit variable.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $urlVar = 'a.id';
+
+	/**
+	 * Method to add a new record.
+	 *
+	 * @return  boolean  True if the article can be added, false if not.
+	 *
+	 * @since   1.6
+	 */
+	public function add()
+	{
+		if (!parent::add())
+		{
+			// Redirect to the return page.
+			$this->setRedirect($this->getReturnPage());
+		}
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('id'), 'int');
+		$allow      = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the URL check it.
+			$allow = JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId);
+		}
+
+		if ($allow !== null)
+		{
+			return $allow;
+		}
+
+		// In the absense of better information, revert to the component permissions.
+		return parent::allowAdd($data);
+	}
+
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId   = (int) isset($data[$key]) ? $data[$key] : 0;
+		$categoryId = 0;
+
+		if ($recordId)
+		{
+			$categoryId = (int) $this->getModel()->getItem($recordId)->catid;
+		}
+
+		if ($categoryId)
+		{
+			// The category has been set. Check the category permissions.
+			return JFactory::getUser()->authorise('core.edit', $this->option . '.category.' . $categoryId);
+		}
+
+		// Since there is no asset tracking, revert to the component permissions.
+		return parent::allowEdit($data, $key);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function cancel($key = 'w_id')
+	{
+		$return = parent::cancel($key);
+
+		// Redirect to the return page.
+		$this->setRedirect($this->getReturnPage());
+
+		return $return;
+	}
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = 'w_id')
+	{
+		return parent::edit($key, $urlVar);
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.5
+	 */
+	public function getModel($name = 'form', $prefix = '', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = null)
+	{
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
+		$itemId = $this->input->getInt('Itemid');
+		$return = $this->getReturnPage();
+
+		if ($itemId)
+		{
+			$append .= '&Itemid=' . $itemId;
+		}
+
+		if ($return)
+		{
+			$append .= '&return=' . base64_encode($return);
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Get the return URL if a "return" variable has been passed in the request
+	 *
+	 * @return  string  The return URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReturnPage()
+	{
+		$return = $this->input->get('return', null, 'base64');
+
+		if (empty($return) || !JUri::isInternal(base64_decode($return)))
+		{
+			return JUri::base();
+		}
+
+		return base64_decode($return);
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function save($key = null, $urlVar = 'w_id')
+	{
+		// Get the application
+		$app = JFactory::getApplication();
+
+		// Get the data from POST
+		$data = $this->input->post->get('jform', array(), 'array');
+
+		// Save the data in the session.
+		$app->setUserState('com_weblinks.edit.weblink.data', $data);
+		$result = parent::save($key, $urlVar);
+
+		// If ok, redirect to the return page.
+		if ($result)
+		{
+			// Flush the data from the session
+			$app->setUserState('com_weblinks.edit.weblink.data', null);
+			$this->setRedirect($this->getReturnPage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Go to a weblink
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function go()
+	{
+		// Get the ID from the request
+		$id = $this->input->getInt('id');
+
+		// Get the model, requiring published items
+		$modelLink = $this->getModel('Weblink', '', array('ignore_request' => true));
+		$modelLink->setState('filter.published', 1);
+
+		// Get the item
+		$link = $modelLink->getItem($id);
+
+		// Make sure the item was found.
+		if (empty($link))
+		{
+			return JError::raiseWarning(404, JText::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'));
+		}
+
+		// Check whether item access level allows access.
+		$groups = JFactory::getUser()->getAuthorisedViewLevels();
+
+		if (!in_array($link->access, $groups))
+		{
+			return JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR'));
+		}
+
+		// Check whether category access level allows access.
+		$modelCat = $this->getModel('Category', 'WeblinksModel', array('ignore_request' => true));
+		$modelCat->setState('filter.published', 1);
+
+		// Get the category
+		$category = $modelCat->getCategory($link->catid);
+
+		// Make sure the category was found.
+		if (empty($category))
+		{
+			return JError::raiseWarning(404, JText::_('COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND'));
+		}
+
+		// Check whether item access level allows access.
+		if (!in_array($category->access, $groups))
+		{
+			return JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR'));
+		}
+
+		// Redirect to the URL
+		// @todo: Probably should check for a valid http link
+		if ($link->url)
+		{
+			$modelLink->hit($id);
+			JFactory::getApplication()->redirect($link->url, 301);
+		}
+
+		return JError::raiseWarning(404, JText::_('COM_WEBLINKS_ERROR_WEBLINK_URL_INVALID'));
+	}
+}

src/components/com_weblinks/helpers/association.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('WeblinksHelper', JPATH_ADMINISTRATOR . '/components/com_weblinks/helpers/weblinks.php');
+JLoader::register('WeblinksHelperRoute', JPATH_SITE . '/components/com_weblinks/helpers/route.php');
+JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php');
+
+/**
+ * Weblinks Component Association Helper
+ *
+ * @since  3.0
+ */
+abstract class WeblinksHelperAssociation extends CategoryHelperAssociation
+{
+	/**
+	 * Method to get the associations for a given item
+	 *
+	 * @param   integer  $id    Id of the item
+	 * @param   string   $view  Name of the view
+	 *
+	 * @return  array   Array of associations for the item
+	 *
+	 * @since   3.0
+	 */
+	public static function getAssociations($id = 0, $view = null)
+	{
+		$jinput = JFactory::getApplication()->input;
+		$view   = is_null($view) ? $jinput->get('view') : $view;
+		$id     = empty($id) ? $jinput->getInt('id') : $id;
+
+		if ($view === 'weblink')
+		{
+			if ($id)
+			{
+				$associations = JLanguageAssociations::getAssociations('com_weblinks', '#__weblinks', 'com_weblinks.item', $id);
+
+				$return = array();
+
+				foreach ($associations as $tag => $item)
+				{
+					$return[$tag] = WeblinksHelperRoute::getWeblinkRoute($item->id, (int) $item->catid, $item->language);
+				}
+
+				return $return;
+			}
+		}
+
+		if ($view == 'category' || $view == 'categories')
+		{
+			return self::getCategoryAssociations($id, 'com_weblinks');
+		}
+
+		return array();
+	}
+}

src/components/com_weblinks/helpers/category.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Weblinks Component Category Tree.
+ *
+ * @since  1.6
+ */
+class WeblinksCategories extends JCategories
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($options = array())
+	{
+		$options['table'] = '#__weblinks';
+		$options['extension'] = 'com_weblinks';
+
+		parent::__construct($options);
+	}
+}

src/components/com_weblinks/helpers/icon.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Site
  * @subpackage  com_weblinks
@@ -8,9 +7,8 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
+defined('_JEXEC') or die;
+
 /**
  * Weblink Component HTML Helper.
  *
@@ -18,40 +16,74 @@
  */
 class JHtmlIcon
 {
-    /**
-     * Create a link to create a new weblink
-     *
-     * @param   object                     $category  The category information
-     * @param   \Joomla\Registry\Registry  $params    The item parameters
-     *
-     * @return  string
-     */
-    public static function create($category, $params)
-    {
-        return self::getIcon()->create($category, $params);
-    }
+	/**
+	 * Create a link to create a new weblink
+	 *
+	 * @param   mixed  $weblink  Unused
+	 * @param   mixed  $params   Unused
+	 *
+	 * @return  string
+	 */
+	public static function create($weblink, $params)
+	{
+		JHtml::_('bootstrap.tooltip');
 
-    /**
-     * Create a link to edit an existing weblink
-     *
-     * @param   object                     $weblink  Weblink data
-     * @param   \Joomla\Registry\Registry  $params   Item params
-     * @param   array                      $attribs  Unused
-     *
-     * @return  string
-     */
-    public static function edit($weblink, $params, $attribs = [])
-    {
-        return self::getIcon()->edit($weblink, $params, $attribs);
-    }
+		$uri = JUri::getInstance();
+		$url = JRoute::_(WeblinksHelperRoute::getFormRoute(0, base64_encode($uri)));
+		$text = JHtml::_('image', 'system/new.png', JText::_('JNEW'), null, true);
+		$button = JHtml::_('link', $url, $text);
 
-    /**
-     * Creates an icon instance.
-     *
-     * @return  \Joomla\Component\Weblinks\Administrator\Service\HTML\Icon
-     */
-    private static function getIcon()
-    {
-        return (new \Joomla\Component\Weblinks\Administrator\Service\HTML\Icon(Joomla\CMS\Factory::getApplication()));
-    }
+		return '<span class="hasTooltip" title="' . JHtml::tooltipText('COM_WEBLINKS_FORM_CREATE_WEBLINK') . '">' . $button . '</span>';
+	}
+
+	/**
+	 * Create a link to edit an existing weblink
+	 *
+	 * @param   object                     $weblink  Weblink data
+	 * @param   \Joomla\Registry\Registry  $params   Item params
+	 * @param   array                      $attribs  Unused
+	 *
+	 * @return  string
+	 */
+	public static function edit($weblink, $params, $attribs = array())
+	{
+		$uri = JUri::getInstance();
+
+		if ($params && $params->get('popup'))
+		{
+			return;
+		}
+
+		if ($weblink->state < 0)
+		{
+			return;
+		}
+
+		JHtml::_('bootstrap.tooltip');
+
+		$url	= WeblinksHelperRoute::getFormRoute($weblink->id, base64_encode($uri));
+		$icon	= $weblink->state ? 'edit.png' : 'edit_unpublished.png';
+		$text	= JHtml::_('image', 'system/' . $icon, JText::_('JGLOBAL_EDIT'), null, true);
+
+		if ($weblink->state == 0)
+		{
+			$overlib = JText::_('JUNPUBLISHED');
+		}
+		else
+		{
+			$overlib = JText::_('JPUBLISHED');
+		}
+
+		$date = JHtml::_('date', $weblink->created);
+		$author = $weblink->created_by_alias ? $weblink->created_by_alias : $weblink->author;
+
+		$overlib .= '&lt;br /&gt;';
+		$overlib .= $date;
+		$overlib .= '&lt;br /&gt;';
+		$overlib .= htmlspecialchars($author, ENT_COMPAT, 'UTF-8');
+
+		$button = JHtml::_('link', JRoute::_($url), $text);
+
+		return '<span class="hasTooltip" title="' . JHtml::tooltipText('COM_WEBLINKS_EDIT') . ' :: ' . $overlib . '">' . $button . '</span>';
+	}
 }

src/components/com_weblinks/helpers/route.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @package     Joomla.Site
  * @subpackage  com_weblinks
@@ -8,16 +7,265 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-use Joomla\Component\Weblinks\Site\Helper\RouteHelper;
+defined('_JEXEC') or die;
 
 /**
  * Weblinks Component Route Helper.
  *
  * @since  1.5
  */
-abstract class WeblinksHelperRoute extends RouteHelper
+abstract class WeblinksHelperRoute
 {
+	protected static $lookup;
+
+	protected static $lang_lookup = array();
+
+	/**
+	 * Get the route of the weblink
+	 *
+	 * @param   integer  $id        Web link ID
+	 * @param   integer  $catid     Category ID
+	 * @param   string   $language  Language
+	 *
+	 * @return  string
+	 */
+	public static function getWeblinkRoute($id, $catid, $language = 0)
+	{
+		$needles = array('weblink'  => array((int) $id));
+
+		// Create the link
+		$link = 'index.php?option=com_weblinks&view=weblink&id=' . $id;
+
+		if ($catid > 1)
+		{
+			$categories = JCategories::getInstance('Weblinks');
+			$category = $categories->get($catid);
+
+			if ($category)
+			{
+				$needles['category'] = array_reverse($category->getPath());
+				$needles['categories'] = $needles['category'];
+				$link .= '&catid=' . $catid;
+			}
+		}
+
+		if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+		{
+			self::buildLanguageLookup();
+
+			if (isset(self::$lang_lookup[$language]))
+			{
+				$link .= '&lang=' . self::$lang_lookup[$language];
+				$needles['language'] = $language;
+			}
+		}
+
+		if ($item = self::_findItem($needles))
+		{
+			$link .= '&Itemid=' . $item;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Ge the form route
+	 *
+	 * @param   integer  $id      The id of the weblink.
+	 * @param   string   $return  The return page variable.
+	 *
+	 * @return  string
+	 */
+	public static function getFormRoute($id, $return = null)
+	{
+		// Create the link.
+		if ($id)
+		{
+			$link = 'index.php?option=com_weblinks&task=weblink.edit&w_id=' . $id;
+		}
+		else
+		{
+			$link = 'index.php?option=com_weblinks&task=weblink.add&w_id=0';
+		}
+
+		if ($return)
+		{
+			$link .= '&return=' . $return;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Get the Category Route
+	 *
+	 * @param   JCategoryNode|string|integer  $catid     JCategoryNode object or category ID
+	 * @param   integer                       $language  Language code
+	 *
+	 * @return  string
+	 */
+	public static function getCategoryRoute($catid, $language = 0)
+	{
+		if ($catid instanceof JCategoryNode)
+		{
+			$id = $catid->id;
+			$category = $catid;
+		}
+		else
+		{
+			$id = (int) $catid;
+			$category = JCategories::getInstance('Weblinks')->get($id);
+		}
+
+		if ($id < 1 || !($category instanceof JCategoryNode))
+		{
+			$link = '';
+		}
+		else
+		{
+			$needles = array();
+
+			// Create the link
+			$link = 'index.php?option=com_weblinks&view=category&id=' . $id;
+
+			$catids = array_reverse($category->getPath());
+			$needles['category'] = $catids;
+			$needles['categories'] = $catids;
+
+			if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+			{
+				self::buildLanguageLookup();
+
+				if (isset(self::$lang_lookup[$language]))
+				{
+					$link .= '&lang=' . self::$lang_lookup[$language];
+					$needles['language'] = $language;
+				}
+			}
+
+			if ($item = self::_findItem($needles))
+			{
+				$link .= '&Itemid=' . $item;
+			}
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Do a language lookup
+	 *
+	 * @return  void
+	 */
+	protected static function buildLanguageLookup()
+	{
+		if (count(self::$lang_lookup) == 0)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('a.sef AS sef')
+				->select('a.lang_code AS lang_code')
+				->from('#__languages AS a');
+
+			$db->setQuery($query);
+			$langs = $db->loadObjectList();
+
+			foreach ($langs as $lang)
+			{
+				self::$lang_lookup[$lang->lang_code] = $lang->sef;
+			}
+		}
+	}
+
+	/**
+	 * Find items per given $needles
+	 *
+	 * @param   array  $needles  A given array of needles to find
+	 *
+	 * @return  void
+	 */
+	protected static function _findItem($needles = null)
+	{
+		$app      = JFactory::getApplication();
+		$menus    = $app->getMenu('site');
+		$language = isset($needles['language']) ? $needles['language'] : '*';
+
+		// Prepare the reverse lookup array.
+		if (!isset(self::$lookup[$language]))
+		{
+			self::$lookup[$language] = array();
+
+			$component = JComponentHelper::getComponent('com_weblinks');
+
+			$attributes = array('component_id');
+			$values = array($component->id);
+
+			if ($language != '*')
+			{
+				$attributes[] = 'language';
+				$values[] = array($needles['language'], '*');
+			}
+
+			$items = $menus->getItems($attributes, $values);
+
+			if ($items)
+			{
+				foreach ($items as $item)
+				{
+					if (isset($item->query) && isset($item->query['view']))
+					{
+						$view = $item->query['view'];
+
+						if (!isset(self::$lookup[$language][$view]))
+						{
+							self::$lookup[$language][$view] = array();
+						}
+
+						if (isset($item->query['id']))
+						{
+							/**
+							 * Here it will become a bit tricky
+							 * language != * can override existing entries
+							 * language == * cannot override existing entries
+							 */
+							if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
+							{
+								self::$lookup[$language][$view][$item->query['id']] = $item->id;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if ($needles)
+		{
+			foreach ($needles as $view => $ids)
+			{
+				if (isset(self::$lookup[$language][$view]))
+				{
+					foreach ($ids as $id)
+					{
+						if (isset(self::$lookup[$language][$view][(int) $id]))
+						{
+							return self::$lookup[$language][$view][(int) $id];
+						}
+					}
+				}
+			}
+		}
+
+		// Check if the active menuitem matches the requested language
+		$active = $menus->getActive();
+
+		if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
+		{
+			return $active->id;
+		}
+
+		// If not found, return language specific home link
+		$default = $menus->getDefault($language);
+
+		return !empty($default->id) ? $default->id : null;
+	}
 }

src/components/com_weblinks/metadata.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+</metadata>

src/components/com_weblinks/models/categories.php

@@ -0,0 +1,139 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This models supports retrieving lists of article categories.
+ *
+ * @since  1.6
+ */
+class WeblinksModelCategories extends JModelList
+{
+	/**
+	 * Context string for the model type.  This is used to handle uniqueness
+	 * when dealing with the getStoreId() method and caching data structures.
+	 *
+	 * @var  string
+	 */
+	protected $context = 'com_weblinks.categories';
+
+	/**
+	 * The category context (allows other extensions to derived from this model).
+	 *
+	 * @var  string
+	 */
+	protected $_extension = 'com_weblinks';
+
+	private $_parent = null;
+
+	private $_items = null;
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$this->setState('filter.extension', $this->_extension);
+
+		// Get the parent id if defined.
+		$parentId = $app->input->getInt('id');
+		$this->setState('filter.parentId', $parentId);
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('filter.published', 1);
+		$this->setState('filter.access', true);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.extension');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.parentId');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Redefine the function and add some properties to make the styling more easy
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 */
+	public function getItems()
+	{
+		if ($this->_items === null)
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new JRegistry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_num_links', 1) || !$params->get('show_empty_categories_cat', 0);
+			$categories = JCategories::getInstance('Weblinks', $options);
+			$this->_parent = $categories->get($this->getState('filter.parentId', 'root'));
+
+			if (is_object($this->_parent))
+			{
+				$this->_items = $this->_parent->getChildren();
+			}
+			else
+			{
+				$this->_items = false;
+			}
+		}
+
+		return $this->_items;
+	}
+
+	/**
+	 * Get the parent
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_parent))
+		{
+			$this->getItems();
+		}
+
+		return $this->_parent;
+	}
+}

src/components/com_weblinks/models/category.php

@@ -0,0 +1,407 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Weblinks Component Weblink Model
+ *
+ * @since  1.5
+ */
+class WeblinksModelCategory extends JModelList
+{
+	/**
+	 * Category items data
+	 *
+	 * @var array
+	 */
+	protected $_item = null;
+
+	protected $_articles = null;
+
+	protected $_siblings = null;
+
+	protected $_children = null;
+
+	protected $_parent = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'hits', 'a.hits',
+				'ordering', 'a.ordering',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * The category that applies.
+	 *
+	 * @var  object
+	 */
+	protected $_category = null;
+
+	/**
+	 * The list of other weblink categories.
+	 *
+	 * @var  array
+	 */
+	protected $_categories = null;
+
+	/**
+	 * Method to get a list of items.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 */
+	public function getItems()
+	{
+		// Invoke the parent getItems method to get the main list
+		$items = parent::getItems();
+
+		// Convert the params field into an object, saving original in _params
+		foreach ($items as $item)
+		{
+			if (!isset($this->_params))
+			{
+				$params = new Registry;
+				$params->loadString($item->params);
+				$item->params = $params;
+			}
+
+			// Get the tags
+			$item->tags = new JHelperTags;
+			$item->tags->getItemTags('com_weblinks.weblink', $item->id);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to get a JDatabaseQuery object for retrieving the data set from a database.
+	 *
+	 * @return  JDatabaseQuery   A JDatabaseQuery object to retrieve the data set.
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels());
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select required fields from the categories.
+		$query->select($this->getState('list.select', 'a.*'))
+			->from($db->quoteName('#__weblinks') . ' AS a')
+			->where('a.access IN (' . $groups . ')');
+
+		// Filter by category.
+		if ($categoryId = $this->getState('category.id'))
+		{
+			// Group by subcategory
+			if ($this->getState('category.group', 0))
+			{
+				$query->select('c.title AS category_title')
+					->where('c.parent_id = ' . (int) $categoryId)
+					->join('LEFT', '#__categories AS c ON c.id = a.catid')
+					->where('c.access IN (' . $groups . ')');
+			}
+			else
+			{
+				$query->where('a.catid = ' . (int) $categoryId)
+					->join('LEFT', '#__categories AS c ON c.id = a.catid')
+					->where('c.access IN (' . $groups . ')');
+			}
+
+			// Filter by published category
+			$cpublished = $this->getState('filter.c.published');
+
+			if (is_numeric($cpublished))
+			{
+				$query->where('c.published = ' . (int) $cpublished);
+			}
+		}
+
+		// Join over the users for the author and modified_by names.
+		$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
+			->select("ua.email AS author_email")
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
+			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
+
+		// Filter by state
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.state = ' . (int) $state);
+		}
+
+		// Do not show trashed links on the front-end
+		$query->where('a.state != -2');
+
+		// Filter by start and end dates.
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate  = $db->quote(JFactory::getDate()->toSql());
+
+		if ($this->getState('filter.publish_date'))
+		{
+			$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+				->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('list.filter');
+
+		if (!empty($search))
+		{
+			$search = $db->quote('%' . $db->escape($search, true) . '%');
+			$query->where('(a.title LIKE ' . $search . ')');
+		}
+
+		// If grouping by subcategory, add the subcategory list ordering clause.
+		if ($this->getState('category.group', 0))
+		{
+			$query->order(
+				$db->escape($this->getState('category.ordering', 'c.lft')) . ' ' .
+				$db->escape($this->getState('category.direction', 'ASC'))
+			);
+		}
+
+		// Add the list ordering clause.
+		$query->order(
+			$db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' .
+			$db->escape($this->getState('list.direction', 'ASC'))
+		);
+
+		return $query;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$params = JComponentHelper::getParams('com_weblinks');
+
+		// List state information
+		$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
+		$this->setState('list.limit', $limit);
+
+		$limitstart = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $limitstart);
+
+		// Optional filter text
+		$this->setState('list.filter', $app->input->getString('filter-search'));
+
+		$orderCol = $app->input->get('filter_order', 'ordering');
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'ordering';
+		}
+
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+
+		$this->setState('list.direction', $listOrder);
+
+		$id = $app->input->get('id', 0, 'int');
+		$this->setState('category.id', $id);
+
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_weblinks')) && (!$user->authorise('core.edit', 'com_weblinks')))
+		{
+			// Limit to published for people who can't edit or edit.state.
+			$this->setState('filter.state', 1);
+
+			// Filter by start and end dates.
+			$this->setState('filter.publish_date', true);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get category data for the current category
+	 *
+	 * @return  object
+	 *
+	 * @since   1.5
+	 */
+	public function getCategory()
+	{
+		if (!is_object($this->_item))
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new Registry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_num_links_cat', 1)
+				|| $params->get('show_empty_categories', 0);
+
+			$categories = JCategories::getInstance('Weblinks', $options);
+			$this->_item = $categories->get($this->getState('category.id', 'root'));
+
+			if (is_object($this->_item))
+			{
+				$this->_children = $this->_item->getChildren();
+				$this->_parent = false;
+
+				if ($this->_item->getParent())
+				{
+					$this->_parent = $this->_item->getParent();
+				}
+
+				$this->_rightsibling = $this->_item->getSibling();
+				$this->_leftsibling = $this->_item->getSibling(false);
+			}
+			else
+			{
+				$this->_children = false;
+				$this->_parent = false;
+			}
+		}
+
+		return $this->_item;
+	}
+
+	/**
+	 * Get the parent category
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_parent;
+	}
+
+	/**
+	 * Get the leftsibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getLeftSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_leftsibling;
+	}
+
+	/**
+	 * Get the rightsibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getRightSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_rightsibling;
+	}
+
+	/**
+	 * Get the child categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getChildren()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_children;
+	}
+
+	/**
+	 * Increment the hit counter for the category.
+	 *
+	 * @param   integer  $pk  Optional primary key of the category to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 *
+	 * @since   3.2
+	 */
+	public function hit($pk = 0)
+	{
+		$hitcount = JFactory::getApplication()->input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
+			$table = JTable::getInstance('Category', 'JTable');
+			$table->load($pk);
+			$table->hit($pk);
+		}
+
+		return true;
+	}
+}