From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 5 Jul 2009 18:33:12 +0000 (-0400)
Subject: set/get viewdesigns flag and use it
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e6c54a59e140c9ee3b6244dbcb92f9ca9d065887;p=quix0rs-gnu-social.git

set/get viewdesigns flag and use it
---

diff --git a/actions/othersettings.php b/actions/othersettings.php
index b542233ca7..1277f80527 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -83,14 +83,12 @@ class OthersettingsAction extends AccountSettingsAction
     {
         $user = common_current_user();
 
-
         $this->elementStart('form', array('method' => 'post',
                                           'id' => 'form_settings_other',
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('othersettings')));
         $this->elementStart('fieldset');
-        $this->element('legend', null, _('URL Auto-shortening'));
         $this->hidden('token', common_session_token());
 
         // I18N
@@ -109,10 +107,14 @@ class OthersettingsAction extends AccountSettingsAction
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
-        $this->dropdown('urlshorteningservice', _('Service'),
+        $this->dropdown('urlshorteningservice', _('Shorten URLs with'),
                         $services, _('Automatic shortening service to use.'),
                         false, $user->urlshorteningservice);
         $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->checkbox('viewdesigns', _('View profile designs'),
+                        $user->viewdesigns, _('Show or hide profile designs.'));
+        $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
         $this->elementEnd('fieldset');
@@ -145,6 +147,8 @@ class OthersettingsAction extends AccountSettingsAction
             return;
         }
 
+        $viewdesigns = $this->boolean('viewdesigns');
+
         $user = common_current_user();
 
         assert(!is_null($user)); // should already be checked
@@ -154,6 +158,7 @@ class OthersettingsAction extends AccountSettingsAction
         $original = clone($user);
 
         $user->urlshorteningservice = $urlshorteningservice;
+        $user->viewdesigns          = $viewdesigns;
 
         $result = $user->update($original);
 
diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index bc95921f1b..58777c283a 100644
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -34,7 +34,7 @@ if (!defined('LACONICA')) {
 /**
  * Base class for actions that use a group's design
  *
- * Pages related to groups can be themed with a design. 
+ * Pages related to groups can be themed with a design.
  * This superclass returns that design.
  *
  * @category Action
@@ -48,7 +48,7 @@ class GroupDesignAction extends Action {
 
     /** The group in question */
     var $group = null;
-    
+
     /**
       * Show the groups's design stylesheet
       *
@@ -58,10 +58,14 @@ class GroupDesignAction extends Action {
      {
          parent::showStylesheets();
 
-         $design = $this->getDesign();
+         $user = common_current_user();
+
+         if (empty($user) || $user->viewdesigns) {
+             $design = $this->getDesign();
 
-         if (!empty($design)) {
-             $design->showCSS($this);
+             if (!empty($design)) {
+                 $design->showCSS($this);
+             }
          }
      }
 
@@ -76,12 +80,10 @@ class GroupDesignAction extends Action {
 
     function getDesign()
     {
-
         if (empty($this->group)) {
             return null;
         }
 
         return $this->group->getDesign();
     }
-
 }
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index 424474f429..785b8a93d3 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -61,11 +61,15 @@ class OwnerDesignAction extends Action {
      {
          parent::showStylesheets();
 
-         $design = $this->getDesign();
+         $user = common_current_user();
 
-         if (!empty($design)) {
-             $design->showCSS($this);
-        }
+         if (empty($user) || $user->viewdesigns) {
+             $design = $this->getDesign();
+
+             if (!empty($design)) {
+                 $design->showCSS($this);
+             }
+         }
      }
 
     /**