check if domain is set, also increase length (#431)

Signed-off-by: Xheni Myrtaj <[email protected]>

Author: xh3n1

public_html/lists/admin/defaults.php

@@ -48,18 +48,29 @@ function readentry($file)
         if ($lc_name == '') {
             Fatal_Error($GLOBALS['I18N']->get('Name cannot be empty:')." $lc_name");
         }
-        $lc_name = getNewAttributeTablename($lc_name);
+
 
         $typeValue = 'select';
-        if($lc_name === 'termsofservice'){
+        $terms = 'termsofservice';
+        $adult = 'subscriberisanadult';
+
+        if ($lc_name == '') {
+            Fatal_Error($GLOBALS['I18N']->get('Name cannot be empty:')." $lc_name");
+        }
+        $lc_name = getNewAttributeTablename($lc_name);
+
+        if(substr($lc_name, 0, strlen($terms)) === $terms){
             $typeValue = 'checkbox';
-            $name.= getConfig('domain');
+            if(getConfig('domain')!==null && getConfig('domain')!==''){
+                $name.= getConfig('domain');
+            } else $name.= 'our website';
+
         }
-        if($lc_name === 'subscriberisanadult'){
+        if(substr($lc_name, 0, strlen($adult)) === $adult){
             $typeValue= 'checkbox';
         }
 
-        $query = sprintf('insert into %s (name,type,required,tablename) values("%s","%s",%d,"%s")',
+            $query = sprintf('insert into %s (name,type,required,tablename) values("%s","%s",%d,"%s")',
             $tables['attribute'], addslashes($name), $typeValue, 1, $lc_name);
         Sql_Query($query);
         $insertid = Sql_Insert_id();

public_html/lists/admin/inc/userlib.php

@@ -1145,7 +1145,7 @@ function getNewAttributeTablename($name)
     } else {
         $table = 'attribute';
     }
-    $lc_name = substr(preg_replace("/\W/", '', strtolower($name)), 0, 10);
+    $lc_name = substr(preg_replace("/\W/", '', strtolower($name)), 0, 25);
 //  if ($lc_name == "") Fatal_Error("Name cannot be empty: $lc_name");
     if (!$lc_name) {
         $lc_name = 'attribute';