X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=e2427755852120fa61d1b5b8cb6576b1170dba49;hb=4f213f985f292bab3d54671325954cae34c23fd3;hp=87d8a43993811069a4facf9f9baf810f2dabc2df;hpb=78fc9483d4d1fde4561905edf6594b86c4dc374e;p=quix0rs-gnu-social.git

diff --git a/lib/action.php b/lib/action.php
index 87d8a43993..e242775585 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -141,7 +141,7 @@ class Action extends HTMLOutputter // lawsuit
     function showTitle()
     {
         $this->element('title', null,
-                       sprintf(_("%s - %s"),
+                       sprintf(_("%1\$s - %2\$s"),
                                $this->title(),
                                common_config('site', 'name')));
     }
@@ -199,10 +199,6 @@ class Action extends HTMLOutputter // lawsuit
             if (Event::handle('StartShowStatusNetStyles', array($this)) &&
                 Event::handle('StartShowLaconicaStyles', array($this))) {
                 $this->cssLink('css/display.css',null,'screen, projection, tv');
-                if (common_config('site', 'mobile')) {
-                    // TODO: "handheld" CSS for other mobile devices
-                    $this->cssLink('css/mobile.css','base','only screen and (max-device-width: 480px)'); // Mobile WebKit
-                }
                 $this->cssLink('css/print.css','base','print');
                 Event::handle('EndShowStatusNetStyles', array($this));
                 Event::handle('EndShowLaconicaStyles', array($this));
@@ -252,6 +248,8 @@ class Action extends HTMLOutputter // lawsuit
             if (Event::handle('StartShowJQueryScripts', array($this))) {
                 $this->script('js/jquery.min.js');
                 $this->script('js/jquery.form.js');
+                $this->script('js/jquery.cookie.js');
+                $this->script('js/json2.js');
                 $this->script('js/jquery.joverlay.min.js');
                 Event::handle('EndShowJQueryScripts', array($this));
             }
@@ -371,7 +369,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('div', array('id' => 'header'));
         $this->showLogo();
         $this->showPrimaryNav();
-        $this->showSiteNotice();
+        if (Event::handle('StartShowSiteNotice', array($this))) {
+            $this->showSiteNotice();
+
+            Event::handle('EndShowSiteNotice', array($this));
+        }
         if (common_logged_in()) {
             $this->showNoticeForm();
         } else {
@@ -735,6 +737,8 @@ class Action extends HTMLOutputter // lawsuit
                             _('Privacy'));
             $this->menuItem(common_local_url('doc', array('title' => 'source')),
                             _('Source'));
+            $this->menuItem(common_local_url('version'),
+                            _('Version'));
             $this->menuItem(common_local_url('doc', array('title' => 'contact')),
                             _('Contact'));
             $this->menuItem(common_local_url('doc', array('title' => 'badge')),
@@ -787,23 +791,45 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showContentLicense()
     {
-        $this->element('dt', array('id' => 'site_content_license'), _('Site content license'));
-        $this->elementStart('dd', array('id' => 'site_content_license_cc'));
-        $this->elementStart('p');
-        $this->element('img', array('id' => 'license_cc',
-                                    'src' => common_config('license', 'image'),
-                                    'alt' => common_config('license', 'title'),
-                                    'width' => '80',
-                                    'height' => '15'));
-        //TODO: This is dirty: i18n
-        $this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
-        $this->element('a', array('class' => 'license',
-                                  'rel' => 'external license',
-                                  'href' => common_config('license', 'url')),
-                       common_config('license', 'title'));
-        $this->text(_('license.'));
-        $this->elementEnd('p');
-        $this->elementEnd('dd');
+        if (Event::handle('StartShowContentLicense', array($this))) {
+            $this->element('dt', array('id' => 'site_content_license'), _('Site content license'));
+            $this->elementStart('dd', array('id' => 'site_content_license_cc'));
+
+            switch (common_config('license', 'type')) {
+            case 'private':
+                $this->element('p', null, sprintf(_('Content and data of %1$s are private and confidential.'),
+                                                  common_config('site', 'name')));
+                // fall through
+            case 'allrightsreserved':
+                if (common_config('license', 'owner')) {
+                    $this->element('p', null, sprintf(_('Content and data copyright by %1$s. All rights reserved.'),
+                                                      common_config('license', 'owner')));
+                } else {
+                    $this->element('p', null, _('Content and data copyright by contributors. All rights reserved.'));
+                }
+                break;
+            case 'cc': // fall through
+            default:
+                $this->elementStart('p');
+                $this->element('img', array('id' => 'license_cc',
+                                            'src' => common_config('license', 'image'),
+                                            'alt' => common_config('license', 'title'),
+                                            'width' => '80',
+                                            'height' => '15'));
+                //TODO: This is dirty: i18n
+                $this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
+                $this->element('a', array('class' => 'license',
+                                          'rel' => 'external license',
+                                          'href' => common_config('license', 'url')),
+                               common_config('license', 'title'));
+                $this->text(_('license.'));
+                $this->elementEnd('p');
+                break;
+            }
+
+            $this->elementEnd('dd');
+            Event::handle('EndShowContentLicense', array($this));
+        }
     }
 
     /**
@@ -951,6 +977,36 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
+    /**
+     * Integer value of an argument
+     *
+     * @param string $key      query key we're interested in
+     * @param string $defValue optional default value (default null)
+     * @param string $maxValue optional max value (default null)
+     * @param string $minValue optional min value (default null)
+     *
+     * @return integer integer value
+     */
+
+    function int($key, $defValue=null, $maxValue=null, $minValue=null)
+    {
+        $arg = strtolower($this->trimmed($key));
+
+        if (is_null($arg) || !is_integer($arg)) {
+            return $defValue;
+        }
+
+        if (!is_null($maxValue)) {
+            $arg = min($arg, $maxValue);
+        }
+
+        if (!is_null($minValue)) {
+            $arg = max($arg, $minValue);
+        }
+
+        return $arg;
+    }
+
     /**
      * Server error
      *