]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
9 years agoSettingsAction now extends FormAction (and thus ManagedAction)
Mikael Nordfeldth [Thu, 16 Jul 2015 17:03:53 +0000 (19:03 +0200)]
SettingsAction now extends FormAction (and thus ManagedAction)

9 years agoOAuth widgets separated into their own files
Mikael Nordfeldth [Thu, 16 Jul 2015 16:52:43 +0000 (18:52 +0200)]
OAuth widgets separated into their own files

9 years agoFunction declarations to match parent class
Mikael Nordfeldth [Thu, 16 Jul 2015 16:45:59 +0000 (18:45 +0200)]
Function declarations to match parent class

9 years agoNon-replies cannot harvest parent notice nicknames
Mikael Nordfeldth [Thu, 16 Jul 2015 10:53:10 +0000 (12:53 +0200)]
Non-replies cannot harvest parent notice nicknames

A feature we use of parent notices is that if you use the same @user
as the parent notice, the same @user will be notified, regardless if
there might be @user@site.com as well as @user@example.com and you're
subscribed to just one of them (or both, or none of them!).

But this threw an exception since we tested this on new notice threads.

9 years agoLess redundant code.
Mikael Nordfeldth [Wed, 15 Jul 2015 17:21:21 +0000 (19:21 +0200)]
Less redundant code.

9 years agoRemoving MicroID as well as simplifying profileaction
Mikael Nordfeldth [Tue, 14 Jul 2015 14:52:20 +0000 (16:52 +0200)]
Removing MicroID as well as simplifying profileaction

sorry, forgot to commit in between

9 years agouserrss action didn't call parent preparation method
Mikael Nordfeldth [Sat, 11 Jul 2015 17:48:18 +0000 (19:48 +0200)]
userrss action didn't call parent preparation method

9 years agoDo we update feeduri and salmonuri for Ostatus_profile now?
Mikael Nordfeldth [Sat, 11 Jul 2015 17:46:01 +0000 (19:46 +0200)]
Do we update feeduri and salmonuri for Ostatus_profile now?

When changing from HTTP to HTTPS, following up on commit
59763ceecb33ebf842829cac15f922fa19047de2
where http to https Ostatus_profile URI changing was first introduced.

9 years agoMore RESTish URL (/notice/:notice/delete) for notice delete
Mikael Nordfeldth [Sat, 11 Jul 2015 09:26:48 +0000 (11:26 +0200)]
More RESTish URL (/notice/:notice/delete) for notice delete

Also returns to 'top' now after notice deletion.

9 years agoDeletenoticeForm is its own class now
Mikael Nordfeldth [Sat, 11 Jul 2015 09:16:08 +0000 (11:16 +0200)]
DeletenoticeForm is its own class now

9 years agoNo limit argument to Rss10Action->getNotices() (use $this->limit)
Mikael Nordfeldth [Sat, 11 Jul 2015 09:09:16 +0000 (11:09 +0200)]
No limit argument to Rss10Action->getNotices() (use $this->limit)

9 years agoMerge branch 'nightly' into deletenotice_form_fix
Mikael Nordfeldth [Sat, 11 Jul 2015 08:49:41 +0000 (10:49 +0200)]
Merge branch 'nightly' into deletenotice_form_fix

9 years agobump alpha number to ease remote debugging help
Mikael Nordfeldth [Fri, 10 Jul 2015 23:00:04 +0000 (01:00 +0200)]
bump alpha number to ease remote debugging help

9 years agoForgot to push TargetedRss10Action
Mikael Nordfeldth [Fri, 10 Jul 2015 22:32:05 +0000 (00:32 +0200)]
Forgot to push TargetedRss10Action

9 years agoShowfavoritesAction now extends ShowstreamAction
Mikael Nordfeldth [Fri, 10 Jul 2015 22:28:32 +0000 (00:28 +0200)]
ShowfavoritesAction now extends ShowstreamAction

9 years agodefine Subscription_queue::exists as static
Mikael Nordfeldth [Fri, 10 Jul 2015 22:08:23 +0000 (00:08 +0200)]
define Subscription_queue::exists as static

9 years ago$notices and $notice is not the same, silly!
Mikael Nordfeldth [Fri, 10 Jul 2015 21:30:59 +0000 (23:30 +0200)]
$notices and $notice is not the same, silly!

9 years agoApiAction::dateTwitter was called statically from a plugin
Mikael Nordfeldth [Fri, 10 Jul 2015 21:30:17 +0000 (23:30 +0200)]
ApiAction::dateTwitter was called statically from a plugin

9 years agoMagicEnvelope called DOMDocument::loadXML statically
Mikael Nordfeldth [Fri, 10 Jul 2015 21:24:50 +0000 (23:24 +0200)]
MagicEnvelope called DOMDocument::loadXML statically

but apparently we shouldn't do this, despite recommended on https://secure.php.net/manual/en/domdocument.loadxml.php

9 years agoCleaning up Directory plugin lists
Mikael Nordfeldth [Fri, 10 Jul 2015 21:19:54 +0000 (23:19 +0200)]
Cleaning up Directory plugin lists

9 years agoFoafAction now a ManagedAction
Mikael Nordfeldth [Fri, 10 Jul 2015 21:10:24 +0000 (23:10 +0200)]
FoafAction now a ManagedAction

9 years agoShowstreamAction no longer has public ->profile
Mikael Nordfeldth [Fri, 10 Jul 2015 21:09:44 +0000 (23:09 +0200)]
ShowstreamAction no longer has public ->profile

9 years agoForgotten migrations of ->profile and ->user to ->getTarget()
Mikael Nordfeldth [Fri, 10 Jul 2015 20:54:14 +0000 (22:54 +0200)]
Forgotten migrations of ->profile and ->user to ->getTarget()

GalleryAction extends ProfileAction which no longer uses ->profile and ->user

9 years agoThe 'target' is an argument to common_local_url not the target profile
Mikael Nordfeldth [Fri, 10 Jul 2015 20:49:38 +0000 (22:49 +0200)]
The 'target' is an argument to common_local_url not the target profile

9 years agoMerge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
Mikael Nordfeldth [Fri, 10 Jul 2015 14:03:41 +0000 (16:03 +0200)]
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

9 years agoMerge branch 'jquery-cookie-undefined' into 'nightly'
mmn [Fri, 10 Jul 2015 14:03:30 +0000 (14:03 +0000)]
Merge branch 'jquery-cookie-undefined' into 'nightly'

Updates jquery.cookie usage to match changes from v1.4.0

`$.cookie('name')` returns `undefined` instead of `null` when cookie is not present.

This fixes a problem where the browser was never asking for location,
and the JSON.parse call was throwing an exception when the geolocation
cookie wasn't present.

Deleting a cookie should use `$.removeCookie('name')` instead of `$.cookie('name', null)`.

[Reference](https://github.com/carhartl/jquery-cookie/blob/7f88a4e631aba8a8c688fd8999ce6b9bcfd50718/CHANGELOG.md#140).

See merge request !20

9 years agoMerge branch 'master' into nightly
Mikael Nordfeldth [Fri, 10 Jul 2015 14:02:55 +0000 (16:02 +0200)]
Merge branch 'master' into nightly

9 years agoMerge branch 'permissions-fix' into 'master'
mmn [Fri, 10 Jul 2015 14:01:49 +0000 (14:01 +0000)]
Merge branch 'permissions-fix' into 'master'

Permissions fix

During Debian packaging I noticed that executable permissions on several files are incorrect.  In the fist case files such as .gitignore, .png, .ico were wrongly set as executable.  In the second case, files that are meant to be running on the command line such as maintenance scripts starting with "#!/usr/bin/env php" do not have executable permissions.  These files were identified by lintian automatic checking program.  This merge request aims to fix the problem.

See merge request !21

9 years agoMerge branch 'nightly' into deletenotice_form_fix
Mikael Nordfeldth [Fri, 10 Jul 2015 11:54:06 +0000 (13:54 +0200)]
Merge branch 'nightly' into deletenotice_form_fix

9 years agoShowstreamAction tidying up
Mikael Nordfeldth [Fri, 10 Jul 2015 11:44:47 +0000 (13:44 +0200)]
ShowstreamAction tidying up

Lots of these changes mean that we're requiring certain values to
either by typed properly or return the expected value. If it doesn't
there should be a fatal exception thrown which we can followup in the
logs and won't go silently suppressed.

9 years agostatic definition of User::getByNickname
Mikael Nordfeldth [Fri, 10 Jul 2015 10:59:19 +0000 (12:59 +0200)]
static definition of User::getByNickname

9 years agoShowstreamAction fixes so it's not as horrible
Mikael Nordfeldth [Fri, 10 Jul 2015 10:34:06 +0000 (12:34 +0200)]
ShowstreamAction fixes so it's not as horrible

9 years agoSpiff up the PersonalTagCloudSection class
Mikael Nordfeldth [Fri, 10 Jul 2015 10:23:55 +0000 (12:23 +0200)]
Spiff up the PersonalTagCloudSection class

missing a fix in actions/showstream.php for the switched position
of arguments in the constructor

9 years agoEasy comparison of two Profile objects
Mikael Nordfeldth [Fri, 10 Jul 2015 10:19:08 +0000 (12:19 +0200)]
Easy comparison of two Profile objects

9 years agoRedirecturlAction now extends ManagedAction
Mikael Nordfeldth [Fri, 10 Jul 2015 10:08:33 +0000 (12:08 +0200)]
RedirecturlAction now extends ManagedAction

9 years agoAdd executable permission to script missing it
Bhuvan Krishna [Fri, 10 Jul 2015 09:16:08 +0000 (14:46 +0530)]
Add executable permission to script missing it

9 years agoRemove executable permissions where unnecessary
Bhuvan Krishna [Fri, 10 Jul 2015 08:52:02 +0000 (14:22 +0530)]
Remove executable permissions where unnecessary

9 years agodelete notice form fix
Mikael Nordfeldth [Thu, 9 Jul 2015 22:52:22 +0000 (00:52 +0200)]
delete notice form fix

9 years agoIntroducing TargetedRss10Action for simplifying RSS 1.0
Mikael Nordfeldth [Thu, 9 Jul 2015 22:28:36 +0000 (00:28 +0200)]
Introducing TargetedRss10Action for simplifying RSS 1.0

9 years ago/:nickname/all/rss had to be before /:tagger/all/:tag
Mikael Nordfeldth [Thu, 9 Jul 2015 22:27:26 +0000 (00:27 +0200)]
/:nickname/all/rss had to be before /:tagger/all/:tag

...though this makes it impossible to get a list called "rss"

so FIXME, the RSS 1.0 actions should be in the API or something

9 years agoNeed to supply data to NoSuchUserException
Mikael Nordfeldth [Thu, 9 Jul 2015 22:08:09 +0000 (00:08 +0200)]
Need to supply data to NoSuchUserException

9 years agoRss10Action migrated to ManagedAction
Mikael Nordfeldth [Thu, 9 Jul 2015 21:14:23 +0000 (23:14 +0200)]
Rss10Action migrated to ManagedAction

9 years agoStartpageAction essentially duplicated TopAction
Mikael Nordfeldth [Thu, 9 Jul 2015 21:01:50 +0000 (23:01 +0200)]
StartpageAction essentially duplicated TopAction

9 years agoPEAR's Mail_mimeDecode updated
Mikael Nordfeldth [Thu, 9 Jul 2015 20:29:23 +0000 (22:29 +0200)]
PEAR's Mail_mimeDecode updated

9 years agoNo static calls (PEAR sucks ass)
Mikael Nordfeldth [Thu, 9 Jul 2015 20:26:03 +0000 (22:26 +0200)]
No static calls (PEAR sucks ass)

9 years agosearchsubmenu item() function definition
Mikael Nordfeldth [Thu, 9 Jul 2015 20:19:19 +0000 (22:19 +0200)]
searchsubmenu item() function definition

9 years agostatic function definitions and minor simplifying
Mikael Nordfeldth [Thu, 9 Jul 2015 20:16:14 +0000 (22:16 +0200)]
static function definitions and minor simplifying

9 years agoRss10Action now in an autodetected file.
Mikael Nordfeldth [Thu, 9 Jul 2015 12:22:22 +0000 (14:22 +0200)]
Rss10Action now in an autodetected file.

9 years agoCSS can handle alternating row colouring now
Mikael Nordfeldth [Thu, 9 Jul 2015 12:04:07 +0000 (14:04 +0200)]
CSS can handle alternating row colouring now

9 years agoType controlling in lib/atomnoticefeed.php
Mikael Nordfeldth [Thu, 9 Jul 2015 11:56:02 +0000 (13:56 +0200)]
Type controlling in lib/atomnoticefeed.php

9 years agoAPI actions are not ManagedAction yet
Mikael Nordfeldth [Thu, 9 Jul 2015 11:46:03 +0000 (13:46 +0200)]
API actions are not ManagedAction yet

9 years agoDelete notice script added. Give an ID or URI.
Mikael Nordfeldth [Wed, 8 Jul 2015 10:30:21 +0000 (12:30 +0200)]
Delete notice script added. Give an ID or URI.

9 years agoGravatar relies on closed source 3rd party
Mikael Nordfeldth [Wed, 8 Jul 2015 05:57:27 +0000 (07:57 +0200)]
Gravatar relies on closed source 3rd party

9 years agoFile_redirection static fixes and simplifying
Mikael Nordfeldth [Tue, 7 Jul 2015 18:16:05 +0000 (20:16 +0200)]
File_redirection static fixes and simplifying

9 years agohandle function declaration to match parent
Mikael Nordfeldth [Tue, 7 Jul 2015 18:02:41 +0000 (20:02 +0200)]
handle function declaration to match parent

9 years agoFile_redirection minor coding layout fix
Mikael Nordfeldth [Tue, 7 Jul 2015 17:59:43 +0000 (19:59 +0200)]
File_redirection minor coding layout fix

9 years agoFile_redirection is called statically
Mikael Nordfeldth [Tue, 7 Jul 2015 17:48:18 +0000 (19:48 +0200)]
File_redirection is called statically

9 years agoRobotstxtAction migrated to ManagedAction
Mikael Nordfeldth [Tue, 7 Jul 2015 17:45:01 +0000 (19:45 +0200)]
RobotstxtAction migrated to ManagedAction

9 years agoprepare and handle function to match parents
Mikael Nordfeldth [Tue, 7 Jul 2015 17:34:42 +0000 (19:34 +0200)]
prepare and handle function to match parents

9 years agoDon't statically call Validate functions
Mikael Nordfeldth [Tue, 7 Jul 2015 17:30:14 +0000 (19:30 +0200)]
Don't statically call Validate functions

9 years agoDirectMessagePlugin actions modernified
Mikael Nordfeldth [Tue, 7 Jul 2015 17:18:45 +0000 (19:18 +0200)]
DirectMessagePlugin actions modernified

9 years agoJanrain OpenID extlib updated
Mikael Nordfeldth [Sun, 5 Jul 2015 21:07:41 +0000 (23:07 +0200)]
Janrain OpenID extlib updated

From their tree on a4090d0b30f850044413630333341cd327cbb55a
Source: https://github.com/openid/php-openid

9 years agoMismatching function declarations.
Mikael Nordfeldth [Sat, 4 Jul 2015 17:51:36 +0000 (19:51 +0200)]
Mismatching function declarations.

9 years agoI had some inheritance the wrong way around.
Mikael Nordfeldth [Sat, 4 Jul 2015 17:48:35 +0000 (19:48 +0200)]
I had some inheritance the wrong way around.

9 years agoForgot NoticestreamAction, thanks roland.
Mikael Nordfeldth [Fri, 3 Jul 2015 22:02:05 +0000 (00:02 +0200)]
Forgot NoticestreamAction, thanks roland.

9 years agoStronger typing and fixes in RequireValidatedEmail
Mikael Nordfeldth [Fri, 3 Jul 2015 08:17:15 +0000 (10:17 +0200)]
Stronger typing and fixes in RequireValidatedEmail

9 years agoonly variables can be sent by reference (strict standards)
Mikael Nordfeldth [Thu, 25 Jun 2015 18:13:27 +0000 (20:13 +0200)]
only variables can be sent by reference (strict standards)

9 years agonon-static method was called statically, now defined static
Mikael Nordfeldth [Tue, 23 Jun 2015 11:24:19 +0000 (13:24 +0200)]
non-static method was called statically, now defined static

9 years agostricter typing in GroupsNav menu widget
Mikael Nordfeldth [Tue, 23 Jun 2015 10:56:19 +0000 (12:56 +0200)]
stricter typing in GroupsNav menu widget

9 years agoSelftagWidget had mismatching url() definition
Mikael Nordfeldth [Tue, 23 Jun 2015 10:37:00 +0000 (12:37 +0200)]
SelftagWidget had mismatching url() definition

9 years agoFeedList widget had mismatching show() definition
Mikael Nordfeldth [Tue, 23 Jun 2015 10:26:44 +0000 (12:26 +0200)]
FeedList widget had mismatching show() definition

9 years agoAccessibility fix, make yes button more explicit
Mikael Nordfeldth [Mon, 22 Jun 2015 21:40:51 +0000 (23:40 +0200)]
Accessibility fix, make yes button more explicit

9 years ago$.cookie('n', null) -> $.removeCookie as of 1.4.0
Chimo [Sat, 20 Jun 2015 23:35:43 +0000 (19:35 -0400)]
$.cookie('n', null) -> $.removeCookie as of 1.4.0

9 years agojquery-cookie returns `undefined` as of 1.4.0
Chimo [Sat, 20 Jun 2015 23:26:45 +0000 (19:26 -0400)]
jquery-cookie returns `undefined` as of 1.4.0

when a cookie isn't set.

This fixes a problem where the browser was never asking for location,
and the JSON.parse call was throwing an exception when the geolocation cookie wasn't
present.

9 years agoLess redundant code, please
Mikael Nordfeldth [Sat, 20 Jun 2015 23:37:29 +0000 (01:37 +0200)]
Less redundant code, please

9 years agoMerge branch 'plugins-documentation' into 'nightly'
mmn [Sat, 20 Jun 2015 22:49:31 +0000 (22:49 +0000)]
Merge branch 'plugins-documentation' into 'nightly'

Plugins documentation

* Bring content from https://web.archive.org/web/20140821102047/http://status.net/wiki/HOWTO_Make_a_Plugin
* Point link on Plugins Admin Panel page to plugins/README.md ( Ref #53 )
* Add link to "Community Plugins"

See merge request !19

9 years agoMerge branch 'remove_broken_plugins_from_default' into 'nightly'
mmn [Sat, 20 Jun 2015 22:48:49 +0000 (22:48 +0000)]
Merge branch 'remove_broken_plugins_from_default' into 'nightly'

Drop QnA from default plugins

Since it doesn't work (at least at the moment) it shouldn't be proposed as default plugin

See merge request !15

9 years agoMerge branch 'drop_corporate_text' into 'nightly'
mmn [Sat, 20 Jun 2015 22:48:31 +0000 (22:48 +0000)]
Merge branch 'drop_corporate_text' into 'nightly'

Drop corporate text plus minor rewording

Following [this discussion](https://gnusocial.no/conversation/190441#notice-190441) I only fixed corporate-only occurrences. I suggest People instead of User directory. Moreover I fixed a minor inconsistency (Trends should be preferred to Trending topics).

The full locale folder should be fixed once we have digitaldreamer's feedback. But we can at least start from this.

See merge request !16

9 years agoMerge branch 'character_count' into 'nightly'
mmn [Sat, 20 Jun 2015 22:47:22 +0000 (22:47 +0000)]
Merge branch 'character_count' into 'nightly'

Fix #31 character count floats in replies

See merge request !17

9 years agoimplement javascript callbacks (no remove yet)
Mikael Nordfeldth [Sun, 14 Jun 2015 21:14:00 +0000 (23:14 +0200)]
implement javascript callbacks (no remove yet)

9 years agooops forgot an alert()
Mikael Nordfeldth [Sun, 14 Jun 2015 20:04:57 +0000 (22:04 +0200)]
oops forgot an alert()

9 years agoMove some javascript out to an E (Event) object
Mikael Nordfeldth [Sun, 14 Jun 2015 19:57:39 +0000 (21:57 +0200)]
Move some javascript out to an E (Event) object

9 years agoAdd link to 'community plugins'
chimo [Sun, 14 Jun 2015 16:05:54 +0000 (12:05 -0400)]
Add link to 'community plugins'

9 years agoDocumentation about plugins
chimo [Sun, 14 Jun 2015 15:59:46 +0000 (11:59 -0400)]
Documentation about plugins

* Content in plugins/doc/Plugin_development.md from:
https://web.archive.org/web/20140821102047/http://status.net/wiki/HOWTO_Make_a_Plugin

* Point link on Plugins Admin Panel page to plugins/README.md

9 years agoNo reason to have makeRegex protected
Mikael Nordfeldth [Fri, 12 Jun 2015 15:15:39 +0000 (17:15 +0200)]
No reason to have makeRegex protected

9 years agoFix #31 character count floats in replies
aroquen [Sun, 7 Jun 2015 20:44:33 +0000 (22:44 +0200)]
Fix #31 character count floats in replies

9 years agoRewording: trends instead of trending topics for consistency with other occurrences
aroquen [Sun, 7 Jun 2015 20:28:19 +0000 (22:28 +0200)]
Rewording: trends instead of trending topics for consistency with other occurrences

9 years agoRewording: people instead of user directory
aroquen [Sun, 7 Jun 2015 20:27:31 +0000 (22:27 +0200)]
Rewording: people instead of user directory

9 years agoNo corporate-only strings in code base anymore
aroquen [Sun, 7 Jun 2015 20:24:14 +0000 (22:24 +0200)]
No corporate-only strings in code base anymore

9 years agoDrop QnA from default plugins
aroquen [Sun, 7 Jun 2015 12:05:51 +0000 (14:05 +0200)]
Drop QnA from default plugins

9 years agoFile-related functions not declared static
Mikael Nordfeldth [Sun, 7 Jun 2015 07:52:48 +0000 (09:52 +0200)]
File-related functions not declared static

9 years agoAnother function not matching parent declaration
Mikael Nordfeldth [Sun, 7 Jun 2015 07:26:12 +0000 (09:26 +0200)]
Another function not matching parent declaration

9 years agoMerge branch 'subscribers_as_addressees' into 'nightly'
mmn [Sat, 6 Jun 2015 21:14:50 +0000 (21:14 +0000)]
Merge branch 'subscribers_as_addressees' into 'nightly'

Add subscribers as addressees to toselector

Populate the dropdown recipient menu first with groups, then with followed users. There is no alphabetical sorting (perhaps to be added later?). See this discussion https://gnusocial.no/conversation/190705#notice-190705. Thanks to @chimo.

Hope it is good now.

See merge request !14

9 years agoShow nickname if user has oldschool option enabled
Chimo [Sat, 6 Jun 2015 17:49:16 +0000 (13:49 -0400)]
Show nickname if user has oldschool option enabled

9 years agoAdd subscribed users to dropdown menu.
aroquen [Sat, 6 Jun 2015 13:15:10 +0000 (15:15 +0200)]
Add subscribed users to dropdown menu.

9 years agoMerge branch 'doc-src' into 'nightly'
mmn [Sat, 6 Jun 2015 20:27:00 +0000 (20:27 +0000)]
Merge branch 'doc-src' into 'nightly'

Small updates to doc-src files

* Remove mentions of GTalk since it's been replaced by Hangouts which doesn't do XMPP
* Update URLS, use HTTPS where possible

See merge request !11

9 years agoMerge branch 'nightly' into 'nightly'
mmn [Sat, 6 Jun 2015 20:20:52 +0000 (20:20 +0000)]
Merge branch 'nightly' into 'nightly'

fixed realtime action buttons and marker in base, adjusted settings in neo-quitter

fixed realtime action buttons and marker in base so that all neo themes benefit from it, adjusted settings in neo-quitter

See merge request !12

9 years agoMerge branch 'hackfest' into nightly
Mikael Nordfeldth [Sat, 6 Jun 2015 20:15:39 +0000 (22:15 +0200)]
Merge branch 'hackfest' into nightly

9 years agoFunction declarations not matching their parents
Mikael Nordfeldth [Sat, 6 Jun 2015 20:14:56 +0000 (22:14 +0200)]
Function declarations not matching their parents

9 years agoPlugins didn't match lib/plugin.php onPluginVersion function definition
Mikael Nordfeldth [Sat, 6 Jun 2015 20:04:01 +0000 (22:04 +0200)]
Plugins didn't match lib/plugin.php onPluginVersion function definition

I ran:
for i in `grep -R onPluginVersion...version plugins/|cut -d: -f1`; do sed -i '{ s/\(onPluginVersion(\)\(\&\$versions\)/\1array \2/ }' $i; done