Added ability to hide contact information on subleases.

Author: Stardog

boost/boost.php

@@ -18,7 +18,7 @@
  * @license http://opensource.org/licenses/gpl-3.0.html
  */
 $proper_name = 'Properties';
-$version = '2.2.3';
+$version = '2.3.0';
 $register = false;
 $unregister = false;
 $import_sql = false;

boost/update.php

@@ -163,6 +163,10 @@ public function run(&$content)
             case $this->compare('2.2.3'):
                 $methodName = $this->getMethodName('2.2.3');
                 $this->$methodName($content);
+                
+            case $this->compare('2.3.0'):
+                $methodName = $this->getMethodName('2.3.0');
+                $this->$methodName($content);
         }
         return $content;
     }
@@ -436,6 +440,16 @@ public function v2_2_3(&$content)
         $updates = array('Fixed image upload.', 'Added error messages on broken uploads.', 'Added image size limit.');
         $this->addContent($content, '2.2.3', $updates);
     }
+    
+    public function v2_3_0(&$content)
+    {
+        $db = Database::getDB();
+        $tbl = $db->addTable('prop_sublease');
+        $hideContact = new \phpws2\Database\Datatype\Boolean($tbl, 'hideContact');
+        $hideContact->add();
+        $updates = array('Sublease admins may hide contact information.');
+        $this->addContent($content, '2.3.0', $updates);
+    }
 
     private function addContent(&$content, $version, array $changes)
     {

class/Factory/Sublease.php

@@ -142,6 +142,17 @@ public function view($sublease, $admin = false)
             }
             $tpl['otherInformationTemplate'] = PHPWS_SOURCE_DIR . 'mod/properties/templates/sublease/OtherInformation.html';
             $tpl['amenitiesTemplate'] = PHPWS_SOURCE_DIR . 'mod/properties/templates/sublease/Amenities.html';
+            if ($sublease->hideContact && !\Current_User::isLogged()) {
+                $tpl['hideContact'] = true;
+            } else {
+                $tpl['hideContact'] = false;
+            }
+            $auth = \Current_User::getAuthorization();
+            if (isset($auth->login_link)) {
+                $tpl['login'] = $auth->login_link;
+            } else {
+                $tpl['login'] = \Canopy\Server::getSiteUrl() . 'admin';
+            }
             $template = new \phpws2\Template($tpl);
             $template->setModuleTemplate('properties', 'sublease/view.html');
         }
@@ -200,7 +211,7 @@ public function flipSubleaseTimeout()
     public function patch(\properties\Resource\Sublease $sublease, $param,
             $value)
     {
-        static $allowed_params = array('active');
+        static $allowed_params = array('active', 'hideContact');
 
         if (!in_array($param, $allowed_params)) {
             throw new \Exception('Parameter may not be patched');

class/Resource/Sublease.php

@@ -29,6 +29,7 @@ class Sublease extends Place
     protected $landlord_perm;
     protected $move_out_date;
     protected $user_id;
+    protected $hideContact;
     protected $table = 'prop_sublease';
 
     public function __construct()
@@ -43,6 +44,7 @@ public function __construct()
         $this->landlord_perm = new Variable\BooleanVar(false, 'landlord_perm');
         $this->move_out_date = new Variable\DateVar(time() + 86400*180, 'move_out_date');
         $this->user_id = new Variable\IntegerVar(0, 'user_id');
+        $this->hideContact = new Variable\BooleanVar(false, 'hideContact');
     }
 
     public function view()

javascript/SubleaseForm/SubleaseForm.jsx

@@ -16,6 +16,8 @@ import CheckValues from '../Mixin/Helper/CheckValues.js'
 import moment from 'moment'
 import Help from '../Mixin/Html/Help.jsx'
 import UtilityFunctions from '../Mixin/Edit/UtilityFunctions.js'
+import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'
+import {faToggleOn, faToggleOff} from '@fortawesome/free-solid-svg-icons'
 import './style.css'
 
 /* global $, subleaseCurrent */
@@ -41,7 +43,9 @@ export default class SubleaseForm extends Base {
       'setMoveIn',
       'setMoveOut',
       'updateParking',
-      'sendActive'
+      'sendActive',
+      'hideContact',
+      'showContact'
     ]
     bindMethods(methods, this)
   }
@@ -244,6 +248,36 @@ export default class SubleaseForm extends Base {
     ]
   }
 
+  hideContact() {
+    $.ajax({
+      url: './properties/Sublease/' + this.state.sublease.id,
+      data: {
+        varname: 'hideContact',
+        value: true
+      },
+      dataType: 'json',
+      type: 'patch',
+      success: function () {
+        this.setValue('hideContact', true)
+      }.bind(this)
+    })
+  }
+
+  showContact() {
+    $.ajax({
+      url: './properties/Sublease/' + this.state.sublease.id,
+      data: {
+        varname: 'hideContact',
+        value: false
+      },
+      dataType: 'json',
+      type: 'patch',
+      success: function () {
+        this.setValue('hideContact', false)
+      }.bind(this)
+    })
+  }
+
   updateRent(e) {
     const rent = e.target.value.replace(/[^\d]/g, '')
     this.setError('monthly_rent', empty(rent))
@@ -288,40 +322,35 @@ export default class SubleaseForm extends Base {
         onClose={this.unsetMessage}/>
     }
 
+    let hideContactButton
+    if (empty(sublease.hideContact)) {
+      hideContactButton = (
+        <div key="1" onClick={this.hideContact} className="lead pointer text-success"><FontAwesomeIcon icon={faToggleOn}/>&nbsp;Contact information shown to everyone</div>
+      )
+    } else {
+      hideContactButton = (
+        <div key="2" onClick={this.showContact} className="lead pointer text-danger"><FontAwesomeIcon icon={faToggleOff}/>&nbsp;Contact information shown only to other students.</div>
+      )
+    }
+
     let activateButton
-    let deactivateButton
-    let showActivate = 'd-inline'
-    let showDeactivate = 'd-inline'
     if (sublease.id > 0) {
       if (empty(sublease.active)) {
-        showDeactivate = 'd-none'
+        activateButton = (
+          <div key="3" onClick={this.activate} className="lead pointer text-danger"><FontAwesomeIcon icon={faToggleOff}/>&nbsp;Sublease inactive</div>
+        )
       } else {
-        showActivate = 'd-none'
+        activateButton = (
+          <div key="4" onClick={this.deactivate} className="lead pointer text-success"><FontAwesomeIcon icon={faToggleOn}/>&nbsp;Sublease active</div>
+        )
       }
-
-      activateButton = (
-        <div
-          key="1"
-          onClick={this.activate}
-          className={`lead pointer text-muted ${showActivate}`}>
-          <i className="fa fa-toggle-off"></i>&nbsp; Sublease inactive</div>
-      )
-
-      deactivateButton = (
-        <div
-          key="2"
-          onClick={this.deactivate}
-          className={`lead pointer text-success ${showDeactivate}`}>
-          <i className="fa fa-toggle-on"></i>&nbsp; Sublease active</div>
-      )
     }
 
     let contactAlert
     if (this.state.sublease.id === 0) {
       contactAlert = (
         <div className="alert alert-info">
-          <strong>Notice:</strong>&nbsp; a sublease listing requires contact information.<br/>
-          Use our&nbsp;<a href="./properties/Roommate">roommate section</a>&nbsp;ifyouwanttokeep your contact information available only to other students.</div>
+          <strong>Notice:</strong>&nbsp; a sublease listing requires contact information.</div>
       )
     }
 
@@ -355,8 +384,8 @@ export default class SubleaseForm extends Base {
         <h2>{suffixTitle}&nbsp;my sublease</h2>
         {message}
         {contactAlert}
-        <div className="text-align mb-1">
-          {activateButton}{deactivateButton}
+        <div className="mb-1">
+          {activateButton}
         </div>
         <div className="row">
           <div className="col-sm-6">
@@ -397,6 +426,7 @@ export default class SubleaseForm extends Base {
               onChange={this.setValue.bind(this, 'description')}/>
           </div>
         </div>
+        {hideContactButton}
         <div className="row">
           <div className="col-sm-6">
             <InputField

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "properties",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "description": "Online property manager",
   "dependencies": {},
   "devDependencies": {
@@ -11,6 +11,9 @@
     "@essappstate/canopy-react-buttongroup": "^0.2.0",
     "@essappstate/canopy-react-inputfield": "^0.2.0",
     "@essappstate/canopy-react-overlay": "^0.2.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.18",
+    "@fortawesome/free-solid-svg-icons": "^5.8.2",
+    "@fortawesome/react-fontawesome": "^0.1.4",
     "assets-webpack-plugin": "^3.9.10",
     "babel-loader": "^8.0.5",
     "browser-sync": "^2.26.3",

package.json

@@ -33,8 +33,12 @@ <h3 class="sublease-address"><a href="<?=$property_map_address?>" target="_blank
       <div class="card card-success">
         <div class="card-header"><h4>Contact information</h4></div>
         <div class="card-body">
+          <?php if($hideContact):?>
+          <p><a href="<?=$login?>">Log in for contact information.</a></p>
+          <?php else: ?>
           <a href="<?=$contact_phone_tel?>" target="_blank"><i class="fa fa-phone"></i>&nbsp;<?=$contact_phone?></a><br />
           <a href="mailto:<?=$contact_email?>" target="_blank"><i class="far fa-envelope"></i>&nbsp;Email</a>
+          <?php endif; ?>
         </div>
       </div>
     </div>