svn commit: r1787175 - in /vcl/trunk/web: .ht-inc/addomain.php js/resources/addomain.js

[jfthomps]

Author: jfthomps
Date: Thu Mar 16 13:17:33 2017
New Revision: 1787175

URL: http://svn.apache.org/viewvc?rev=1787175&view=rev
Log:
VCL-277 - Add support for images to join Active Directory domains
VCL-867 - Active Directory Authentication for Windows VM's

addomain.php: modified AJeditResource and addResource: removed some commented 
out references to logindescription

addomain.js: removed ADdomain.prototype.colformatter because the only 
difference from the base class function was for logindescription, which has 
been removed

Modified:
    vcl/trunk/web/.ht-inc/addomain.php
    vcl/trunk/web/js/resources/addomain.js

Modified: vcl/trunk/web/.ht-inc/addomain.php
URL: 
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/addomain.php?rev=1787175&r1=1787174&r2=1787175&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/addomain.php (original)
+++ vcl/trunk/web/.ht-inc/addomain.php Thu Mar 16 13:17:33 2017
@@ -227,8 +227,6 @@ class ADdomain extends Resource {
                $args['rscid'] = $rscid;
                $tmp = $this->getData($args);
                $data = $tmp[$rscid];
-               /*$login = preg_replace("/<br>/", "\n", 
$data['logindescription']);
-               $data['logindescription'] = htmlspecialchars_decode($login);*/
                $cdata = $this->basecdata;
                $cdata['rscid'] = $rscid;
                $cdata['olddata'] = $data;
@@ -264,7 +262,6 @@ class ADdomain extends Resource {
 
                $ownerid = getUserlistID($data['owner']);
                $esc_pass = mysql_real_escape_string($data['password']);
-               #$esc_desc = 
mysql_real_escape_string($data['logindescription']);
        
                $query = "INSERT INTO addomain"
                                .       "(name, "

Modified: vcl/trunk/web/js/resources/addomain.js
URL: 
http://svn.apache.org/viewvc/vcl/trunk/web/js/resources/addomain.js?rev=1787175&r1=1787174&r2=1787175&view=diff
==============================================================================
--- vcl/trunk/web/js/resources/addomain.js (original)
+++ vcl/trunk/web/js/resources/addomain.js Thu Mar 16 13:17:33 2017
@@ -21,15 +21,6 @@ function ADdomain() {
 }
 ADdomain.prototype = new Resource();
 
-ADdomain.prototype.colformatter = function(value, rowIndex, obj) {
-       if(obj.field == 'logindescription') {
-               var str = value.replace(/&lt;br>/g, '<br>'); 
-               str = str.replace(/&amp;/g, '&'); 
-               return str;
-       }
-       return value;
-}
-
 var resource = new ADdomain();
 
 function addNewResource(title) {