Merge pull request #4766 from MrPetovan/task/4721-group-button-color

[frio] Add color to group membership action buttons

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index b5122da808854261786e6d9a94e24248e42e4028..06972c36d9f3be9ab16e240482c1f4763f29b15d 100644 (file)
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -27,7 +27,7 @@ class ContactSelector
 
                $o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" >\r\n";
 
-               $s = dba::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $$_SESSION['uid']]);
+               $s = dba::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $_SESSION['uid']]);
                $r = dba::inArray($s);
 
                if (DBM::is_result($r)) {
@@ -123,9 +123,9 @@ class ContactSelector
        {
                $o = '';
                $select = ['', L10n::t('Male'), L10n::t('Female'), L10n::t('Currently Male'), L10n::t('Currently Female'), L10n::t('Mostly Male'), L10n::t('Mostly Female'), L10n::t('Transgender'), L10n::t('Intersex'), L10n::t('Transsexual'), L10n::t('Hermaphrodite'), L10n::t('Neuter'), L10n::t('Non-specific'), L10n::t('Other'), L10n::t('Undecided')];
-       
+
                Addon::callHooks('gender_selector', $select);
-       
+
                $o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
                foreach ($select as $selection) {
                        if ($selection !== 'NOTRANSLATION') {
@@ -136,7 +136,7 @@ class ContactSelector
                $o .= '</select>';
                return $o;
        }
-       
+
        /**
         * @param string $current optional, default empty
         * @param string $suffix  optionsl, default empty
@@ -145,10 +145,10 @@ class ContactSelector
        {
                $o = '';
                $select = ['', L10n::t('Males'), L10n::t('Females'), L10n::t('Gay'), L10n::t('Lesbian'), L10n::t('No Preference'), L10n::t('Bisexual'), L10n::t('Autosexual'), L10n::t('Abstinent'), L10n::t('Virgin'), L10n::t('Deviant'), L10n::t('Fetish'), L10n::t('Oodles'), L10n::t('Nonsexual')];
-       
-       
+
+
                Addon::callHooks('sexpref_selector', $select);
-       
+
                $o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
                foreach ($select as $selection) {
                        if ($selection !== 'NOTRANSLATION') {
@@ -159,7 +159,7 @@ class ContactSelector
                $o .= '</select>';
                return $o;
        }
-       
+
        /**
         * @param string $current optional, default empty
         */
@@ -167,9 +167,9 @@ class ContactSelector
        {
                $o = '';
                $select = ['', L10n::t('Single'), L10n::t('Lonely'), L10n::t('Available'), L10n::t('Unavailable'), L10n::t('Has crush'), L10n::t('Infatuated'), L10n::t('Dating'), L10n::t('Unfaithful'), L10n::t('Sex Addict'), L10n::t('Friends'), L10n::t('Friends/Benefits'), L10n::t('Casual'), L10n::t('Engaged'), L10n::t('Married'), L10n::t('Imaginarily married'), L10n::t('Partners'), L10n::t('Cohabiting'), L10n::t('Common law'), L10n::t('Happy'), L10n::t('Not looking'), L10n::t('Swinger'), L10n::t('Betrayed'), L10n::t('Separated'), L10n::t('Unstable'), L10n::t('Divorced'), L10n::t('Imaginarily divorced'), L10n::t('Widowed'), L10n::t('Uncertain'), L10n::t('It\'s complicated'), L10n::t('Don\'t care'), L10n::t('Ask me')];
-       
+
                Addon::callHooks('marital_selector', $select);
-       
+
                $o .= '<select name="marital" id="marital-select" size="1" >';
                foreach ($select as $selection) {
                        if ($selection !== 'NOTRANSLATION') {

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 9fa55521bea86058271c08c8d51fe8f35c205658..e65e61ee58367a4e3e6005217a36a5a29af1b860 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -287,7 +287,7 @@ class Event extends BaseObject
                                'nofinish' => $event['nofinish'],
                        ];
 
-                       dba::update('event', $updated_fields, ['id' => $event['cid'], 'uid' => $event['uid']]);
+                       dba::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
 
                        $item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
                        if (DBM::is_result($item)) {