Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-25 16:59:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* update to 0.5.0

Browse Source
This commit is contained in:
slawkens 2017-10-10 15:50:46 +02:00
parent 87ba018ab8
commit 739782109e
70 changed files with 89 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CHANGELOG
View File

@ -1,3 +1,22 @@
[0.5.0 - 10.10.2017]
- moved .htaccess rules to plain php (index.php)
- updated tinymce to the latest (4.7.0) version, you can now embed code, for example youtube videos
- added option to uninstall plugin
- added option to require specified myaac, php or database version for plugins, without that plugin won't be installed
- change accountmanagement links to use friendly_urls
- fixed creating new forum thread
- sample characters are now assigned to admin account and have group_id 4 to not be shown on highscores
- added links loaded from database to admin panel - for future plugins
- print some info to error.log when can't find config.lua
- some fixes in account changecomment action
- show info when account name/number or password is empty on login
- fixed showing account login errors
- added few characters hooks
- fixed some kathrine template js bug when shop is disabled
- you can now use slash '/' in custom pages loaded from database
- added new twig function getLink that convert link taking into account config.friendly_urls
- internalLayoutLink -> getLink
[0.4.3 - 05.10.2017]
- better config loader taken from latest gesior, you can now include files in your config by doing dofile('config.local.lua')
- fixed country detection in create account

4
common.php
View File

@ -21,13 +21,13 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
session_start();
define('MYAAC', true);
define('MYAAC_VERSION', '0.4.3');
define('MYAAC_VERSION', '0.5.0');
define('DATABASE_VERSION', 10);
define('TABLE_PREFIX', 'myaac_');
define('START_TIME', microtime(true));

2
config.php
View File

@ -13,7 +13,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/

2
index.php
View File

@ -21,7 +21,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/

2
system/compat_pages.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/counter.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/countries.conf.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/functions.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/hooks.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/init.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/item.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/cache.php
View File

@ -6,7 +6,7 @@
* @author Slawkens <slawkens@gmail.com>
* @author Mark Samman (Talaturen) <marksamman@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/cache_apc.php
View File

@ -6,7 +6,7 @@
* @author Slawkens <slawkens@gmail.com>
* @author Mark Samman (Talaturen) <marksamman@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/cache_eaccelerator.php
View File

@ -6,7 +6,7 @@
* @author Slawkens <slawkens@gmail.com>
* @author Mark Samman (Talaturen) <marksamman@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/cache_file.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/cache_xcache.php
View File

@ -6,7 +6,7 @@
* @author Slawkens <slawkens@gmail.com>
* @author Mark Samman (Talaturen) <marksamman@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/data.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/items.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/timer.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/validator.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/libs/visitors.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/login.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/404.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/account.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/accountmanagement.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/changelog.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/dashboard.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/login.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/logs.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/mailer.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/notepad.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/pages.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/phpinfo.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/players.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/plugins.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/statistics.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/tools.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/version.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/admin/visitors.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/bans.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/bugtracker.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/changelog.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/characters.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/commands.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/createaccount.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/creatures.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/downloads.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
$title = 'Downloads';

2
system/pages/experiencestages.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/experiencetable.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/faq.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/forum.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/guilds.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/highscores.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/houses.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/lastkills.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/lostaccount.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/movies.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/news.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/newsarchive.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
$_GET['archive'] = true;

2
system/pages/online.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/polls.php
View File

@ -6,7 +6,7 @@
* @author Averatec <pervera.pl & otland.net>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/records.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/rules.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/screenshots.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/serverinfo.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/spells.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/pages/team.php
View File

@ -6,7 +6,7 @@
* @author Gesior <jerzyskalski@wp.pl>
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/status.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
system/template.php
View File

@ -5,7 +5,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/
defined('MYAAC') or die('Direct access not allowed!');

2
tools/validate.php
View File

@ -6,7 +6,7 @@
* @package MyAAC
* @author Slawkens <slawkens@gmail.com>
* @copyright 2017 MyAAC
* @version 0.4.3
* @version 0.5.0
* @link http://my-aac.org
*/