From 22bc0ce0e6b166be6ff25c0298241438ead6498f Mon Sep 17 00:00:00 2001
From: Charles Marion <charles.marion@kitware.com>
Date: Wed, 20 Apr 2011 14:38:56 +0200
Subject: [PATCH] ENH: Removed advanced search Improved user settings Added
 user privacy

---
 core/controllers/ErrorController.php          |  4 +-
 core/controllers/SearchController.php         |  5 --
 core/controllers/UserController.php           | 25 ++++++-
 .../components/NotifyErrorComponent.php       | 17 +----
 core/controllers/forms/UserForm.php           |  4 +-
 core/layouts/layout.phtml                     |  3 +-
 core/public/css/layout/main.css               |  5 ++
 core/public/css/search/search.advanced.css    |  0
 core/public/css/user/user.settings.css        | 20 +++++
 core/public/js/layout/main.js                 |  2 +-
 core/public/js/search/search.advanced.js      |  0
 core/translation/fr-main.csv                  | 11 ++-
 core/views/community/manage.phtml             |  2 +-
 core/views/community/view.phtml               |  2 +-
 core/views/element/feed.phtml                 |  2 +-
 core/views/helpers/Linkuser.php               | 21 ++++++
 core/views/item/view.phtml                    |  4 +-
 core/views/search/advanced.phtml              |  8 --
 core/views/user/settings.phtml                | 74 ++++++++++++++++---
 core/views/user/userpage.phtml                | 11 +--
 20 files changed, 159 insertions(+), 61 deletions(-)
 delete mode 100644 core/public/css/search/search.advanced.css
 delete mode 100644 core/public/js/search/search.advanced.js
 create mode 100644 core/views/helpers/Linkuser.php
 delete mode 100644 core/views/search/advanced.phtml

diff --git a/core/controllers/ErrorController.php b/core/controllers/ErrorController.php
index 1a5a58a51..53cbcd7fe 100644
--- a/core/controllers/ErrorController.php
+++ b/core/controllers/ErrorController.php
@@ -3,7 +3,7 @@ class ErrorController extends AppController
 {  
     public $_models=array();
     public $_daos=array();
-    public $_components=array('NotifyError');
+    public $_components=array('NotifyError','Utility');
     public $_forms=array();
     private $_error;  
     private $_environment;  
@@ -81,7 +81,7 @@ public function errorAction()
         }
       else
         {
-        $this->getLogger()->warn('URL: '.$this->Utility->curPageURL()."\n".$this->view->message);
+        $this->getLogger()->warn('URL: '.$this->Component->NotifyError->curPageURL()."\n".$this->view->message);
         }
       
       }  
diff --git a/core/controllers/SearchController.php b/core/controllers/SearchController.php
index 38bdf18fe..6b77db8cd 100644
--- a/core/controllers/SearchController.php
+++ b/core/controllers/SearchController.php
@@ -145,11 +145,6 @@ private function formatResults($order,$items,$folders,$communities,$users)
     return $resultsArray;
     }//formatResults
     
-   /** advanced search  Action */
-  public function advancedAction()
-    {
-    $this->_helper->layout->disableLayout();
-    }//advancedAction
     
   /** search live Action */
   public function liveAction()
diff --git a/core/controllers/UserController.php b/core/controllers/UserController.php
index 5e9ec0368..067e10c71 100644
--- a/core/controllers/UserController.php
+++ b/core/controllers/UserController.php
@@ -8,7 +8,7 @@ class UserController extends AppController
   public $_daos=array(
     'User','Folder','Folderpolicygroup','Folderpolicyuser','Group'
   );
-  public $_components=array('Date','Filter');
+  public $_components=array('Date','Filter','Sortdao');
   public $_forms=array(
     'User'
   );
@@ -178,7 +178,7 @@ public function settingsAction()
     $this->_helper->layout->disableLayout();
     
     $userId=$this->_getParam('userId');
-    if(isset($userId)&&!$this->userSession->Dao->isAdmin())
+    if(isset($userId)&&$userId!=$this->userSession->Dao->getKey()&&!$this->userSession->Dao->isAdmin())
       {
       throw new Zend_Exception('You should be an admin');
       }
@@ -296,6 +296,23 @@ public function settingsAction()
         }
       }
     
+    $communities=array();
+    $groups=$userDao->getGroups();
+    foreach($groups as $group)
+      {
+      $community=$group->getCommunity();
+      if(!isset($communities[$community->getKey()]))
+        {
+        $community->groups=array();
+        $communities[$community->getKey()]=$community;
+        }
+      $communities[$community->getKey()]->groups[]=$group;
+      }
+    $this->Component->Sortdao->field='name';
+    $this->Component->Sortdao->order='asc';
+    usort($communities, array($this->Component->Sortdao,'sortByName'));
+    
+    $this->view->communities=$communities;
     $this->view->user=$userDao;
     $this->view->thumbnail=$userDao->getThumbnail();
     $this->view->jsonSettings=array();
@@ -325,6 +342,10 @@ public function userpageAction()
     else
       {
       $userDao=$this->User->load($user_id);
+      if($userDao->getPrivacy()==MIDAS_USER_PRIVATE&&(!isset($this->userSession->Dao)||!$this->userSession->Dao->isAdmin()))
+        {
+        throw new Zend_Exception("Permission error");
+        }
       }
       
     if(!$userDao instanceof UserDao)
diff --git a/core/controllers/components/NotifyErrorComponent.php b/core/controllers/components/NotifyErrorComponent.php
index 3cc454324..bf1fbebc0 100644
--- a/core/controllers/components/NotifyErrorComponent.php
+++ b/core/controllers/components/NotifyErrorComponent.php
@@ -33,15 +33,6 @@ public function fatalEror($logger,$mailer)
       if(!is_null($e = error_get_last()))
         {        
         $environment = Zend_Registry::get('configGlobal')->environment;
-        $db = Zend_Registry::get('dbAdapter');        
-        if(method_exists($db,"getProfiler"))
-          {
-          $profiler = $db->getProfiler();
-          }
-        else
-          {
-          $profiler = new Zend_Db_Profiler();  
-          }  
         
         switch ($environment) {  
             case 'production':  
@@ -68,9 +59,9 @@ public function fatalEror($logger,$mailer)
               header('content-type: text/plain');
               echo $this->getFatalErrorMessage($e);
             }
-        $logger->crit($this->getFatalErrorMessage($e));        
-        }
-      $logger->__destruct();
+        $logger->crit($this->getFatalErrorMessage($e)); 
+        $logger->__destruct();
+        }      
       }
       
     public function warningError($errno, $errstr, $errfile, $errline) 
@@ -91,7 +82,7 @@ public function warningError($errno, $errstr, $errfile, $errline)
       }
       
       
-   private function curPageURL() 
+   public function curPageURL() 
       {
       $pageURL = 'http';
       if (isset($_SERVER["HTTPS"] )&&$_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
diff --git a/core/controllers/forms/UserForm.php b/core/controllers/forms/UserForm.php
index 71db35a32..c5ec860ec 100644
--- a/core/controllers/forms/UserForm.php
+++ b/core/controllers/forms/UserForm.php
@@ -113,8 +113,8 @@ public function createAccountForm($firstname_value=null,$lastname_value=null,$co
     
     $privacy = new Zend_Form_Element_Radio('privacy');
     $privacy->addMultiOptions( array(
-                 MIDAS_USER_PUBLIC => $this->t("Public"),
-                 MIDAS_USER_PRIVATE => $this->t("Private"),
+                 MIDAS_USER_PUBLIC => $this->t("Public (Everyone can access to my information)"),
+                 MIDAS_USER_PRIVATE => $this->t("Private (Nobody can access to my page)"),
                   ))
           ->setRequired(true)
           ->setValue(MIDAS_COMMUNITY_PUBLIC);
diff --git a/core/layouts/layout.phtml b/core/layouts/layout.phtml
index 1e1505e91..70e6840c7 100644
--- a/core/layouts/layout.phtml
+++ b/core/layouts/layout.phtml
@@ -74,7 +74,7 @@
                     <ul>
                       <li onclick="location.replace(\''.$this->webroot.'/user/userpage\');"><a>'.$this->t('My Page').'</a></li>
                       <li class="myAccountLink"><a>'.$this->t('My Account').'</a></li>
-                      <li class="modulesLink"><a>'.$this->t('Modules').'</a></li>';
+                      ';
                 if($this->userDao->isAdmin())
                   {
                   echo '
@@ -130,7 +130,6 @@
           <input type="text" id="live_search" value="<?= $this->t('Jump to a data, folder...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" />
           <input type="hidden" id="live_search_value" value="init"  />
           <div id="searchloading" style="display:none"></div>
-          <a id="advancedSearchLink"><?php echo $this->t('Advanced search')?></a>
        </div>
         <div class="HeaderAction">
           <ul>
diff --git a/core/public/css/layout/main.css b/core/public/css/layout/main.css
index 298a7f688..72dae2867 100644
--- a/core/public/css/layout/main.css
+++ b/core/public/css/layout/main.css
@@ -56,6 +56,11 @@ img.thumbnailSmall{
   margin-right: 3px;
 }
 
+.ui-widget {
+
+  font-family: 'Lucida Grande', Verdana, Arial, Helvetica, sans-serif !important;
+  font-size: 12px!important;
+}
 /*-------------------------------------------------
 TOP
 -------------------------------------------------*/
diff --git a/core/public/css/search/search.advanced.css b/core/public/css/search/search.advanced.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core/public/css/user/user.settings.css b/core/public/css/user/user.settings.css
index 26fff9d01..28a42ead5 100644
--- a/core/public/css/user/user.settings.css
+++ b/core/public/css/user/user.settings.css
@@ -4,7 +4,27 @@ div#tabsSettings{
   margin-right: auto;
 }
 
+form#modifyAccount span{
+  float:left;
+  width: 80px;
+}
+
 
+form#modifyAccount input[type="text"], form#modifyAccount input[type="password"]{
+width: 200px!important;
+}
+
+div#accountPrivacy{
+  margin-left: 100px;
+}
+
+div#accountPrivacy label{
+  width: auto!important;
+}
+
+div#imageActual{
+  float:right;
+}
 
 /** Tabs*/
 
diff --git a/core/public/js/layout/main.js b/core/public/js/layout/main.js
index d210392a7..ab72d3be2 100644
--- a/core/public/js/layout/main.js
+++ b/core/public/js/layout/main.js
@@ -165,7 +165,7 @@ $(function() {
     });
   
   $('#menuUserInfo').click(function(){
-      globalAuthAsk(json.global.webroot+'/user/userpage');
+      globalAuthAsk(json.global.webroot+'/user/userpage#tabs-3');
   });
   $("div.TopDynamicBar .closeButton").click(function()
   {
diff --git a/core/public/js/search/search.advanced.js b/core/public/js/search/search.advanced.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core/translation/fr-main.csv b/core/translation/fr-main.csv
index 901ac0f13..12acae6d4 100644
--- a/core/translation/fr-main.csv
+++ b/core/translation/fr-main.csv
@@ -44,6 +44,8 @@ Privacy;Confidentialit
 Create;Créer
 Private;Privée
 Public;Publique
+Private (Nobody can access to my page);Privé (Personne ne peut accéder à mes informations)
+Public (Everyone can access to my information);Publique (Tout le monde peut accéder à mes informations)
 Semi-private;Semi-privée
 Description;Description
 Created;Crée
@@ -149,7 +151,9 @@ Save;Sauver
 Please, set the name.;Merci de renseigner le nom.
 Manage Community;Gérer Communauté
 Administrators;Administrateurs
+Administrator;Administrateur
 Moderators;Modérateurs
+Moderator;Modérateur
 There is no custom group.;Il n'y a pas de groupe personnalisé.
 Create a group;Créer un groupe
 Edit a group;Editer une groupe
@@ -162,4 +166,9 @@ All the results;Tous les r
 Number of views;Nombre de vues
 No result found.;Aucun résultat trouvé pour votre recherche.
 Show more results.;Montrer plus de résultats.
-Delete user;Supprimer utilisateur
\ No newline at end of file
+Delete user;Supprimer utilisateur
+Manage Account Information;Gérer le compte utilisateur
+Company;Société
+Please select an image file on your computer (2 MB maximum);Sélectionnez un fichier image sur votre ordinateur (2 Mo maximum)
+My communities;Mes communautés
+You don't belong to any community.;Vous ne faites parti d'aucune communauté.
\ No newline at end of file
diff --git a/core/views/community/manage.phtml b/core/views/community/manage.phtml
index 21e02e76c..8f58d52df 100644
--- a/core/views/community/manage.phtml
+++ b/core/views/community/manage.phtml
@@ -226,7 +226,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
         foreach($this->members as $member)
           {
           if($i>10)break;
-          echo "<li><a href='{$this->webroot}/user/{$member->getKey()}'>{$member->getFullName()}</a></li>";
+          echo "<li>{$this->linkuser($member)}</li>";
           }
       ?>
       </ul>
diff --git a/core/views/community/view.phtml b/core/views/community/view.phtml
index a4bff10ca..3a22ca7fd 100644
--- a/core/views/community/view.phtml
+++ b/core/views/community/view.phtml
@@ -132,7 +132,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
         foreach($this->members as $member)
           {
           if($i>10)break;
-          echo "<li><a href='{$this->webroot}/user/{$member->getKey()}'>{$member->getFullName()}</a></li>";
+          echo "<li>{$this->linkuser($member)}</li>";
           }
       ?>
       </ul>
diff --git a/core/views/element/feed.phtml b/core/views/element/feed.phtml
index ccffac606..0806f541a 100644
--- a/core/views/element/feed.phtml
+++ b/core/views/element/feed.phtml
@@ -41,7 +41,7 @@
       }
     echo "</div>";
     echo "<div class='feedInfo'>";
-    echo "<a href='{$view->webroot}/user/{$feed->getUser()->getKey()}'>{$feed->getUser()->getFullName()}</a> ";
+    echo $view->linkuser($feed->getUser()).' ';
     switch($type)
       {
       case MIDAS_FEED_CREATE_COMMUNITY:
diff --git a/core/views/helpers/Linkuser.php b/core/views/helpers/Linkuser.php
new file mode 100644
index 000000000..0b46c3368
--- /dev/null
+++ b/core/views/helpers/Linkuser.php
@@ -0,0 +1,21 @@
+<?php
+class  Zend_View_Helper_Linkuser
+{
+  /** translation helper */
+    function linkuser($userDao)
+    {
+    if($userDao->getPrivacy()==MIDAS_USER_PUBLIC||isset($this->view->userDao)&&$this->view->userDao->isAdmin()||isset($this->view->userDao)&&$userDao->getKey()==$this->view->userDao->getKey())
+      {
+      return "<a href='{$this->view->webroot}/user/{$userDao->getKey()}'>{$userDao->getFullName()}</a>";
+      }
+    return "{$userDao->getFullName()}";
+    }//en method t
+
+
+
+    /** Set view*/
+    public function setView(Zend_View_Interface $view)
+    {
+        $this->view = $view;
+    }
+}// end class
\ No newline at end of file
diff --git a/core/views/item/view.phtml b/core/views/item/view.phtml
index 8ff6bbc47..7af5817d0 100644
--- a/core/views/item/view.phtml
+++ b/core/views/item/view.phtml
@@ -31,7 +31,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/item/item.view.
         {
         echo "<tr>";
         echo "  <td ><a href='{$this->webroot}/download/?items={$this->itemDao->getKey()},{$revision->getRevision()}'>Revision {$revision->getRevision()}</a></td>";
-        echo "  <td>{$this->Date->ago($revision->getDate(),false)} {$this->t('by')} <a href='{$this->webroot}/user/{$revision->getUserId()}'>{$revision->getUser()->getFullName()}</a></td>";
+        echo "  <td>{$this->Date->ago($revision->getDate(),false)} {$this->t('by')} {$this->linkuser($revision->getUser())} </td>";
         echo "  <td>{$revision->getChanges()}</td>";
         echo "</tr>";
         $node++;
@@ -80,7 +80,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/item/item.view.
         </tr>
         <tr>   
           <td><?php echo $this->t('Uploaded by');?></td>  
-          <td><a href="/Midas/MIDAS3/user/<?php echo $this->itemDao->lastrevision->getUser()->getKey()?>"><?php echo $this->itemDao->lastrevision->getUser()->getFullName()?></a></td>
+          <td><?php echo $this->linkuser($this->itemDao->lastrevision->getUser())?></td>
         </tr>
         <tr> 
           <td>Revision</td>   
diff --git a/core/views/search/advanced.phtml b/core/views/search/advanced.phtml
deleted file mode 100644
index c34bb22bf..000000000
--- a/core/views/search/advanced.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/** AJAX Action !!!! */
-echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/search/search.advanced.js?'.time().'"></script>';
-?>
-<link href="<?php echo $this->coreWebroot?>/public/css/search/search.advanced.css?<?php echo time();?> " rel="stylesheet" type="text/css" />
-
-<span style='color:white;'>TODO</span>
-
diff --git a/core/views/user/settings.phtml b/core/views/user/settings.phtml
index 127b26579..d3bbb7582 100644
--- a/core/views/user/settings.phtml
+++ b/core/views/user/settings.phtml
@@ -7,29 +7,39 @@ echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/u
 <div id="tabsSettings">
 	<ul>
 		<li><a href="#tabs-account"><?php echo $this->t('My Account') ?></a></li>
+		<li><a href="#tabs-image"><?php echo $this->t('My picture') ?></a></li>
 		<li><a href="#tabs-password"><?php echo $this->t('Password') ?></a></li>
-		<li><a href="#tabs-modules"><?php echo $this->t('Modules') ?></a></li>
+		<li><a href="#tabs-communities"><?php echo $this->t('My communities') ?></a></li>
 	</ul>
 	<div id="tabs-account">
     <h3><?php echo $this->t('Modify my information')?>:</h3>
     <form  class="genericForm" id="modifyAccount" method="<?php echo $this->accountForm['method']?>"  action="<?php echo $this->accountForm['action']?><?php echo (isset($_GET['userId'])?'?userId='.$_GET['userId']:'')?>">
       <table>
         <tr>
-          <td><?php echo $this->t('Firstname');?><?php echo $this->accountForm['firstname']?></td>
-          <td><?php echo $this->t('Lastname');?><?php echo $this->accountForm['lastname']?></td>
+          <td><span><?php echo $this->t('Firstname');?>:</span><?php echo $this->accountForm['firstname']?></td>
+          <td><span><?php echo $this->t('Lastname');?>:</span><?php echo $this->accountForm['lastname']?></td>
         </tr>
         <tr>
-          <td><?php echo $this->t('Company');?><?php echo $this->accountForm['company']?></td>
+          <td><span><?php echo $this->t('Company');?>:</span><?php echo $this->accountForm['company']?></td>
         </tr>
         <tr>
-          <td><?php echo $this->t('Privacy');?><?php echo $this->accountForm['privacy']?></td>
+          <td colspan=2><?php echo $this->t('Privacy');?>:
+          <div id='accountPrivacy'><?php echo $this->accountForm['privacy']?>
+          </div>
+          </td>
         </tr>
         <tr>
           <td><?php echo $this->accountForm['modifyAccount']?></td>
         </tr>
       </table>
     </form>
-    <h3><?php echo $this->t('My picture')?>:</h3>
+    
+  </div>
+  
+  <div id="tabs-image">
+    
+    <div id="imageActual">
+    <h4><?php echo $this->t('My picture')?>:</h4>
       <?php
       $thumbnail=$this->thumbnail;
       if(!empty($thumbnail))
@@ -41,14 +51,20 @@ echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/u
         echo "<img id='userTopThumbnail' src='{$this->coreWebroot}/public/images/icons/unknownUser.png' alt=''/>";
         }
       ?>
+    </div>
     <h3><?php echo $this->t('Modify my picture')?>:</h3>
     <form class="genericForm" id="modifyPicture" action="<?php echo $this->webroot?>/user/settings<?php echo (isset($_GET['userId'])?'?userId='.$_GET['userId']:'')?>" method="POST" enctype="multipart/form-data">
-      <input type="hidden" name="MAX_FILE_SIZE" value="1000000">
-      <?php echo $this->t('Choose a picture')?>: <input type="file" name="file" />
+
+      <?php echo $this->t('Please select an image file on your computer (2 MB maximum)')?>
+      <input type="file" name="file" />
+      <br/>
       <br/>
       <input type="submit" name='modifyPicture' value="<?php echo $this->t('Modifier Picture')?>">
-    </form>
+      <br/>
+      <br/>      
+    </form>    
   </div>
+  
 	<div id="tabs-password">
     <h3><?php echo $this->t('Modify my password')?>:</h3>
     <form  class="genericForm" id="modifyPassword" method='POST' action='<?php echo $this->webroot?>/user/settings<?php echo (isset($_GET['userId'])?'?userId='.$_GET['userId']:'')?>'>
@@ -73,8 +89,44 @@ echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/u
       </table>
     </form>
   </div>
-	<div id="tabs-modules">
-    Module
+	<div id="tabs-communities">
+    <?php
+    if(empty($this->communities))
+      {
+      echo $this->t('You don\'t belong to any community.');
+      }
+    else
+      {
+      echo "<h3>{$this->t('Communities')}:</h3>";
+      echo "<ul>";
+      foreach($this->communities as $community)
+        {
+        echo "<li><a style='color:white;' href='{$this->webroot}/community/{$community->getKey()}'>{$community->getName()}</a>";
+        echo "<ul>";
+        foreach($community->groups as $group)
+          {
+          $name=$group->getName();
+          if($group->getKey()==$community->getAdmingroupId())
+            {
+            $name=$this->t("Administrator");
+            }
+          if($group->getKey()==$community->getModeratorgroupId())
+            {
+            $name=$this->t("Moderator");
+            }
+          if($group->getKey()==$community->getMembergroupId())
+            {
+            continue;
+            }
+          echo "<li>{$name}";
+          echo "</li>";
+          }
+        echo "</ul>";
+        echo "</li>";
+        }
+      echo "</ul>";
+      }
+     ?>
   </div>
 </div>
 <div style="display: none;" class="jsonSettingsContent">
diff --git a/core/views/user/userpage.phtml b/core/views/user/userpage.phtml
index ba294a61f..dd964d31b 100644
--- a/core/views/user/userpage.phtml
+++ b/core/views/user/userpage.phtml
@@ -92,14 +92,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
     <h1>Actions</h1>
     <ul>
       <li class="myAccountLink" userid="'.$this->user->getKey().'"><a>'.$this->t('Manage Account Information').'</a></li>
-      <li>'.$this->t('Manage Files').'</li>';
-    if(isset($this->userDao)&&$this->userDao->isAdmin()&&$this->userDao->getKey()!=$this->user->getKey()&&!$this->user->isAdmin())
-      {
-      echo '
-      <li>'.$this->t('Delete user').'</li>
-        ';
-      }
-      echo'
+      <li><a href="'.$this->webroot.'/user/manage/?userId='.$this->user->getKey().'">'.$this->t('Manage Files').'</a></li>
     </ul>
   </div>';
     }
@@ -109,7 +102,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
   if(!empty($this->userCommunities))
     {
     echo "
-    <div class=sideElement".($this->isViewAction)?'First':''." genericCommunities>';
+    <div class=sideElement".(($this->isViewAction)?'First':'')." genericCommunities>
     <h1>Communities</h1>    
     <ul>";