Skip to content

Commit

Permalink
using tags
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisFrench committed Aug 29, 2015
1 parent ddc99b7 commit c73fdc2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
19 changes: 1 addition & 18 deletions bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,7 @@ protected function postSite()
$actor = \Activity\Models\Actors::fetch();

$app = \Base::instance();
$request_kmi = \Dsc\System::instance()->get('input')->get('kmi', null, 'string');

$cookie_kmi = \Dsc\Cookie::get('kmi'); // !empty($_COOKIE['kmi']) ? $_COOKIE['kmi'] : null;
if (!empty($request_kmi))
{
if ($cookie_kmi != $request_kmi)
{
//$app->set('COOKIE.kmi', $request_kmi);
\Dsc\Cookie::set('kmi', $request_kmi);
}

if (empty($actor->name) || $actor->name == \Dsc\System::instance()->get('input')->get('kmi'))
{
$actor->name = $request_kmi;
$actor->store();
}
}


// Track the site visit if it hasn't been done today for this actor
if (empty($actor->last_visit) || $actor->last_visit < date('Y-m-d', strtotime('today')))
{
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
],
"require": {
"php": ">=5.4.0",
"dioscouri/f3-lib": "dev-master",
"dioscouri/f3-admin": "dev-master"
"dioscouri/f3-lib": ">=v0.8",
"dioscouri/f3-admin": ">=v0.8"
},
"autoload": {
"psr-0": {
Expand Down
4 changes: 2 additions & 2 deletions src/Activity/Models/Actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public static function displayValue($value, $format='html')
foreach ($value as $k=>$v)
{
if (is_array($v)) {
$string .= $k .'=' . \Joomla\Utilities\ArrayHelper::toString($v, "=", "|");
$string .= $k .'=' . \DscArrayHelper::toString($v, "=", "|");
} else {
$string .= $k .'=' . $v . "|";
}
Expand All @@ -231,7 +231,7 @@ public static function displayValue($value, $format='html')
foreach ($value as $k=>$v)
{
if (is_array($v)) {
$string .= '<li><b>'. $k .':</b> ' . \Joomla\Utilities\ArrayHelper::toString($v) . '</li>';
$string .= '<li><b>'. $k .':</b> ' . \DscArrayHelper::toString($v) . '</li>';
} else {
$string .= '<li><b>'. $k .':</b> ' . $v . '</li>';
}
Expand Down

0 comments on commit c73fdc2

Please sign in to comment.