Merge branch 'master' of https://github.com/boonex/dolphin

inc/classes/BxDolMetatags.php

@@ -232,14 +232,15 @@ class BxDolMetatags extends BxDol implements iBxDolFactoryObject
     public function keywordsAdd($iId, $s) 
     {
         $a = array();
-        if (!preg_match_all('/(\#[\pL\pN]+)/u', strip_tags($s), $a)) {
+        if (!preg_match_all('/[^&](\#[\pL\pN]+)/u', strip_tags($s), $a)) {
             $this->_oQuery->keywordsDelete($iId);
             return 0;
         }
 
-        $a[0] = array_unique($a[0]);
+        $aTags = array_unique($a[1]);
+        $aTags = array_slice($aTags, 0, BX_METATAGS_KEYWORDS_MAX);
 
-        return $this->_oQuery->keywordsAdd($iId, array_slice($a[0], 0, BX_METATAGS_KEYWORDS_MAX));
+        return $this->_oQuery->keywordsAdd($iId, $aTags);
     }
 
     /**
@@ -310,7 +311,7 @@ class BxDolMetatags extends BxDol implements iBxDolFactoryObject
         $a = $this->keywordsGet($iId);
         if (empty($a))
             return $s;
-    
+
         foreach ($a as $sKeyword)
             $s = str_ireplace('#' . $sKeyword, '<a rel="tag" href="' . BX_DOL_URL_ROOT . 'searchKeyword.php?type=keyword&keyword=' . rawurlencode($sKeyword) . '"><s>#</s><b>' . $sKeyword . '</b></a>', $s);
 

modules/base/general/classes/BxBaseModGeneralFormsEntryHelper.php

@@ -254,11 +254,13 @@ class BxBaseModGeneralFormsEntryHelper extends BxDolProfileForms
 
     public function onDataEditAfter ($iContentId, $aContentInfo, $aTrackTextFieldsChanges, $oProfile)
     {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
         if (!empty($CNF['OBJECT_METATAGS'])) { // && isset($aTrackTextFieldsChanges['changed_fields'][$CNF['FIELD_TEXT']])) { // TODO: check if aTrackTextFieldsChanges works 
             list ($oProfile, $aContentInfo) = $this->_getProfileAndContentData($iContentId);
             $oMetatags = BxDolMetatags::getObjectInstance($CNF['OBJECT_METATAGS']);
             if ($oMetatags->keywordsIsEnabled())
-                $oMetatags->keywordsAddAuto($aContentInfo[$CNF['FIELD_ID']], $aContentInfo, $CNF, $sDisplay);
+                $oMetatags->keywordsAddAuto($aContentInfo[$CNF['FIELD_ID']], $aContentInfo, $CNF, $CNF['OBJECT_FORM_ENTRY_DISPLAY_VIEW']);
             if ($oMetatags->locationsIsEnabled())
                 $oMetatags->locationsAddFromForm($aContentInfo[$CNF['FIELD_ID']], empty($CNF['FIELD_LOCATION_PREFIX']) ? '' : $CNF['FIELD_LOCATION_PREFIX']);
         }
@@ -268,6 +270,8 @@ class BxBaseModGeneralFormsEntryHelper extends BxDolProfileForms
 
     public function onDataAddAfter ($iAccountId, $iContentId)
     {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
         if (!empty($CNF['OBJECT_METATAGS'])) {
             list ($oProfile, $aContentInfo) = $this->_getProfileAndContentData($iContentId);
             $oMetatags = BxDolMetatags::getObjectInstance($CNF['OBJECT_METATAGS']);

modules/boonex/datafox/classes/BxDataFoxModule.php

@@ -55,7 +55,7 @@ class BxDataFoxModule extends BxDolModule
             $e->parentNode->removeChild($e);
 
         // save the result 
-        if (false === ($s = $dom->saveXML($dom->getElementById($sId)))) // in case of error return original string
+        if (false === ($s = $dom->saveXML($dom->getElementsByTagName('div')->item(0)))) // in case of error return original string
             return $sHtml;
 
         // strip added tags
@@ -66,6 +66,7 @@ class BxDataFoxModule extends BxDolModule
 
         $sHtml .= $this->_oTemplate->parseHtmlByName('companies.html', array(
             'bx_repeat:companies' => $aCompanies,
+            'bx_repeat:companies2' => $aCompanies,
         ));
 
         return $sHtml;
@@ -84,7 +85,7 @@ class BxDataFoxModule extends BxDolModule
             unset($a['top_keywords']);
             $aCompanies[$a['id']] = $a;
         }
-        return $aCompanies;
+        return array_values($aCompanies);
     }
 
     function apiGetAccessToken()

modules/boonex/datafox/template/companies.html

@@ -12,8 +12,10 @@
     
             </div>
         </div>
-        <script>
-            $('<sup><a href="javascript:void(0);" onclick="$(\'html, body\').animate({scrollTop:$(\'#__link_id__\').offset().top}, 500);">[__item_number__]</a></sup>').insertAfter($('a.__link_id__'));
-        </script>
     </bx_repeat:companies>
+    <script>
+    <bx_repeat:companies2>
+        $('<sup><a href="javascript:void(0);" onclick="$(\'html, body\').animate({scrollTop:$(\'#__link_id__\').offset().top}, 500);">[__item_number__]</a></sup>').insertAfter($('a.__link_id__'));
+    </bx_repeat:companies2>
+    </script>
 </div>