Merge pull request #64 from DanielnetoDotCom/master

update unstable
WWBN · May 4, 2018 · 82f865d · 82f865d
2 parents 88dca07 + 426d0fa
commit 82f865d
Show file tree

Hide file tree

Showing 27 changed files with 1,619 additions and 1,433 deletions.
diff --git a/install/database.sql b/install/database.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `users` (
   `canStream` TINYINT(1) NULL,
   `canUpload` TINYINT(1) NULL,
   `about` TEXT NULL,
-  `channelName` VARCHAR(45) NOT NULL,
+  `channelName` VARCHAR(45) NULL,
   `emailVerified` TINYINT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE INDEX `user_UNIQUE` (`user` ASC))

diff --git a/objects/categories.json.php b/objects/categories.json.php
@@ -1,6 +1,7 @@
 <?php
 error_reporting(0);
 require_once 'category.php';
+header('Access-Control-Allow-Origin: *');
 header('Content-Type: application/json');
 $categories = Category::getAllCategories();
 $total = Category::getTotalCategories();

diff --git a/objects/login.json.php b/objects/login.json.php
@@ -1,5 +1,5 @@
 <?php
-//header('Access-Control-Allow-Origin: *');
+header('Access-Control-Allow-Origin: *');
 header("Access-Control-Allow-Headers: Content-Type");
 header('Content-Type: application/json');
 if (empty($global['systemRootPath'])) {

diff --git a/objects/status.json.php b/objects/status.json.php
@@ -2,7 +2,7 @@
 if (empty($global['systemRootPath'])) {
     $global['systemRootPath'] = '../';
 }
-//header('Access-Control-Allow-Origin: *');
+header('Access-Control-Allow-Origin: *');
 require_once $global['systemRootPath'] . 'videos/configuration.php';
 require_once $global['systemRootPath'] . 'plugin/MobileManager/MobileManager.php';
 require_once 'functions.php';

diff --git a/objects/user.php b/objects/user.php
@@ -793,6 +793,7 @@ function getEmailVerified() {
      * @return boolean return true is is unique 
      */
     function setChannelName($channelName) {
+        $channelName = trim(preg_replace("/[^0-9A-Z_ -]/i", "", $channelName));
         $user = static::getChannelOwner($channelName);
         if(!empty($user)){ // if the channel name exists and it is not from this user, rename the channel name
             if(empty($this->id) ||  $user['id']!=$this->id){
@@ -821,7 +822,7 @@ static function getChannelLink($users_id=0){
         }else{
             $name = $user->getChannelName();
         }
-        $link = "{$global['webSiteRootURL']}channel/{$name}";
+        $link = "{$global['webSiteRootURL']}channel/".urlencode($name);
         return $link;
 
     }

diff --git a/objects/userAddNew.json.php b/objects/userAddNew.json.php
@@ -18,7 +18,7 @@
 $user->setCanUpload($_POST['canUpload']);
 $user->setStatus($_POST['status']);
 $unique = $user->setChannelName($_POST['channelName']);
-if(!$unique){
+if(!empty($_POST['channelName']) && !$unique){
     echo '{"error":"'.__("Channel name already exists").'"}';
     exit;
 }