Merge branch 'cyy_bug' into 'master'

Cyy bug

See merge request easycorp/zentaopms!2810

module/company/model.php

@@ -137,7 +137,9 @@ class companyModel extends model
      */
     public function update()
     {
-        $company = fixer::input('post')->get();
+        $company = fixer::input('post')
+            ->stripTags('name')
+            ->get();
         if($company->website  == 'http://') $company->website  = '';
         if($company->backyard == 'http://') $company->backyard = '';
         $companyID = $this->app->company->id;

module/repo/control.php

@@ -360,7 +360,7 @@ class repo extends control
     public function browse($repoID = 0, $branchID = '', $objectID = 0, $path = '', $revision = 'HEAD', $refresh = 0)
     {
         $repoID = $this->repo->saveState($repoID, $objectID);
-        if($branchID) $branchID = base64_decode($branchID);
+        if($branchID) $branchID = base64_decode(urldecode($branchID));
 
         /* Get path and refresh. */
         if($this->get->repoPath) $path = $this->get->repoPath;

module/repo/view/browse.html.php

@@ -31,7 +31,7 @@
         foreach($branches as $id => $branchName)
         {
             $isSelected = $id == $branchID ? 'class="selected"' : '';
-            $base64BranchID = base64_encode($id);
+            $base64BranchID = urlencode(base64_encode($id));
             echo "<li $isSelected>" . html::a($this->createLink('repo', 'browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID"), $branchName, '', "title='{$branchName}' class='text-ellipsis' data-app='{$app->tab}'") . "</li>";
         }
         ?>