Merge in the changes

AgentK20 · AgentK20 · commit 90febcdd0f13 · 2013-12-18T01:39:26.000-05:00
diff --git a/assets/pages.class.php b/assets/pages.class.php
@@ -59,7 +59,7 @@ public function raw() {
             $rowCode = $queryCode->fetch_assoc();
             $newCount = $row['downloads'] + 1;
             $this->mainClass->queryDatabase("UPDATE repo_entries SET downloads='$newCount' WHERE pubID='$pubID'");
-            echo "<!DOCTYPE html><html><body><pre>" . htmlspecialchars($rowCode['code']) . "</pre></body></html>";
+            echo "<html><body><pre>" . htmlspecialchars($rowCode['code']) . "</pre></body></html";
             exit;
         }
     }
@@ -206,6 +206,7 @@ public function post() {
             'descriptionError' => false,
             'typeError' => false,
             'tagError' => false,
+            'dVersionError' => false,
             'tags' => false,
             'name' => false,
             'nameError' => false,
@@ -274,6 +275,7 @@ public function edit() {
             'descriptionError' => false,
             'typeError' => false,
             'tagError' => false,
+            'dVersionError' => false,
             'tags' => false,
             'name' => false,
             'output' => 'post.tpl',
@@ -311,6 +313,7 @@ public function edit() {
                 'scriptCode' => $rowCode['code'],
                 'description' => $checkRow['description'],
                 'tags' => $checkRow['tags'],
+                'denizen_version' => $checkRow['denizen_version'],
                 'activePage' => 'edit'
                     ));
         }
diff --git a/assets/scriptrepo.class.php b/assets/scriptrepo.class.php
@@ -1,6 +1,6 @@
 <?php
 class ScriptRepo{
-    public $mainSite = 'http://scripts.citizensnpcs.co/';
+    public $mainSite = '/';
     public $rootDir = '/usr/share/nginx/www/scripts/';
     public $loggedIn = false;
     public $admin = false;
@@ -284,6 +284,7 @@ public function postScript($postData, $oldID=false){
         if(isset($postData['scriptCode']) && $postData['scriptCode']!=""){ $values = array_merge($values, array('scriptCode' => $postData['scriptCode'])); }
         if(isset($postData['Description']) && $postData['Description']!=""){ $values = array_merge($values, array('description' => $postData['Description'])); }
         if(isset($postData['tags']) && $postData['tags']!=""){ $values = array_merge($values, array('tags' => $postData['tags'])); }
+        if(isset($postData['dVersion']) && $postData['dVersion']!=""){ $values = array_merge($values, array('denizen_version' => $postData['dVersion'])); }
         if($postData['name']==""){
             return array_merge($values, array(
                 'postSuccess' => false,
@@ -320,6 +321,12 @@ public function postScript($postData, $oldID=false){
                 'postError' => 'You must enter at least one tag!',
                 'tagError' => true
             ));
+        }elseif(!isset($postData['dVersion']) || $postData['dVersion']==""){
+            return array_merge($values, array(
+                'postSuccess' => false,
+                'postError' => 'You must set a denizen version!',
+                'dVersionError' => true
+            ));
         }elseif(stripos($postData['Description'], "<script>")){
             return array_merge($values, array(
                 'postSuccess' => false,
@@ -334,15 +341,16 @@ public function postScript($postData, $oldID=false){
             $description = $this->databaseHandle->real_escape_string($postData['Description']);
             $name = $this->databaseHandle->real_escape_string($postData['name']);
             $username = $this->username;
+            $dVersion = $this->databaseHandle->real_escape_string($postData['dVersion']);
             $tagString = implode(', ', $tags);
             $timestamp = time();
             if(!$oldID){
                 $pubID = $this->generatePublicID();
-                $this->queryDatabase("INSERT INTO repo_entries (id, pubID, author, name, description, tags, privacy, scriptType, dscript, timestamp, edited, downloads, views) VALUES ('NULL', '$pubID', '$username', '$name', '$description', '$tagString', '$privacy', '$typeOfScript', '$dscript', '$timestamp', $timestamp, 0, 0)");
+                $this->queryDatabase("INSERT INTO repo_entries (id, pubID, author, name, description, tags, denizen_version, privacy, scriptType, dscript, timestamp, edited, downloads, views) VALUES ('NULL', '$pubID', '$username', '$name', '$description', '$tagString', '$dVersion', '$privacy', '$typeOfScript', '$dscript', '$timestamp', $timestamp, 0, 0)");
                 $this->queryDatabase("INSERT INTO repo_code (id, pubID, code) VALUES ('NULL', '$pubID', '$scriptCode')");
             }else{
                 $pubID = $oldID;
-                $this->queryDatabase("UPDATE repo_entries SET name='$name', description='$description', tags='$tagString', privacy='$privacy', scriptType='$typeOfScript', dscript='$dscript', edited='$timestamp' WHERE pubID='$pubID'");
+                $this->queryDatabase("UPDATE repo_entries SET name='$name', description='$description', tags='$tagString', denizen_version='$dVersion', privacy='$privacy', scriptType='$typeOfScript', dscript='$dscript', edited='$timestamp' WHERE pubID='$pubID'");
                 $this->queryDatabase("UPDATE repo_code SET code='$scriptCode' WHERE pubID='$pubID'");
             }
             return array( 'postSuccess' => true, 'newID' => $pubID );
@@ -407,4 +415,4 @@ public function redirect($newPage){
         exit;
     }
 }
-?>
+?>
diff --git a/assets/templates/404.tpl b/assets/templates/404.tpl
@@ -2,4 +2,4 @@
 
 If you're seeing this page because of the fact that it doesn't exist yet, try checking back in a few days.<br><br>
 
-If you think you're seeing this page in error, please <a href="/support">Contact Us.</a>
+If you think you're seeing this page in error, please <a href="http://scripts.citizensnpcs.com/support">Contact Us.</a>
diff --git a/assets/templates/edit.tpl b/assets/templates/edit.tpl
@@ -12,6 +12,8 @@
             <textarea id='scriptCode' name='scriptCode' rows="10" class="span7">{$scriptCode}</textarea>{if $scriptError}</div>{/if}
             {if $tagError}<div class="control-group error">{/if}<label for='tags' >Tags:</label>
             <input class="input-large" name='tags' id='tags' type="text"{if $tags} value="{$tags}"{/if} /><br>{if $tagError}</div>{/if}
+            {if $dVersionError}<div class="control-group error">{/if}<label for='dVersion' >Denizen Version:</label>
+            <input class="input-small" name='dVersion' id='dVersion' type="text"{if $denizen_version} value="{$denizen_version}"{/if} /><br>{if $dVersionError}</div>{/if}
             <small class="muted">Separate tags with a comma.</small><br><br>
             <small class="muted">Pick one!</small><br><br>
             <label for='privacy'>Privacy:</label>
diff --git a/assets/templates/post.tpl b/assets/templates/post.tpl
@@ -12,6 +12,8 @@
             <textarea id='scriptCode' name='scriptCode' rows="10" class="span7">{$scriptCode}</textarea>{if $scriptError}</div>{/if}
             {if $tagError}<div class="control-group error">{/if}<label for='tags' >Tags:</label>
             <input class="input-large" name='tags' id='tags' type="text"{if $tags} value="{$tags}"{/if} /><br>{if $tagError}</div>{/if}
+            {if $dVersionError}<div class="control-group error">{/if}<label for='dVersion' >Denizen Version:</label>
+            <input class="input-small" name='dVersion' id='dVersion' type="text"{if $denizen_version} value="{$denizen_version}"{/if} /><br>{if $dVersionError}</div>{/if}
             <small class="muted">Separate tags with a comma.</small><br><br>
             {if $typeError}<div class="control-group error">{/if}<label>Type of code:</label>
             <input type="hidden" name="typeOfScript" value="None" />
diff --git a/assets/templates/view.tpl b/assets/templates/view.tpl
@@ -7,10 +7,11 @@
 {if $viewSuccess}<div class="alert alert-success"><button type="button" class="close" data-dismiss="alert">X</button>{$viewSuccess}</div>{/if}
 <div width="100%">
     <div class="span3 well well-large pull-right" style="margin:1em;display:block;">
-        <h4 style="text-align:center;">{$dataToUse.name}</h4><br>
+        <h4 style="text-align:center;">{$dataToUse.name}</h2><br>
         <b>Author: </b><a href="{buildURL page='user/'}{$dataToUse.author}">{$dataToUse.author}</a><br>
         <b>Created: </b><abbr class="timeago" title="{$dateCreated}">{$dateCreated}</abbr><br>
         <b>Edited: </b><abbr class="timeago" title="{$dateEdited}">{$dateEdited}</abbr><br>
+        <b>Denizen Version: </b>{if $dataToUse.denizen_version}{$dataToUse.denizen_version}{else}0.76{/if}<br>
         <b>Views: </b>{$dataToUse.views}<br>
         <b>Downloads: </b>{$dataToUse.downloads}<br>
         <b>Likes: </b>{$likes}<br>
@@ -50,7 +51,7 @@
 </div>
 <form id='post' method='post' accept-charset='UTF-8'>
     <fieldset>
-        <textarea rows="4"{if !$ScriptRepo->loggedIn} disabled{/if} class="span7" id="commentField" name="commentField" placeholder="{if $ScriptRepo->loggedIn}Comment{else}Log in to comment!{/if}">{if $commentField}{$commentField}{/if}</textarea><br>
+        <textarea rows="4"{if !$ScriptRepo->loggedIn}disabled{/if} class="span7" id="commentField" name="commentField" placeholder="{if $ScriptRepo->loggedIn}Comment{else}Log in to comment!{/if}">{if $commentField}{$commentField}{/if}</textarea><br>
         <input class="btn btn-small btn-primary" type='Submit' name='Submit' value='Submit' /><br>
     </fieldset>
-</form>
+</form>

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`If you're seeing this page because of the fact that it doesn't exist yet, try checking back in a few days.<br><br>`
`4`	`4`
`5`		`-If you think you're seeing this page in error, please <a href="/support">Contact Us.</a>`
	`5`	`+If you think you're seeing this page in error, please <a href="http://scripts.citizensnpcs.com/support">Contact Us.</a>`