Added check for stable or dev release

Author: Groruk

web/includes/sb-callback.php

@@ -2285,16 +2285,16 @@ function CheckVersion()
 
     $objResponse->addAssign("relver", "innerHTML",  $version['version']);
 
-    if (defined('SB_GIT')) {
+    if (SB_DEV) {
         if (intval($version['git']) > SB_GITREV) {
-            $svnmsg = "<span style='color:#aa0000;'><strong>A New Beta Version is Available.</strong></span>";
+            $svnmsg = "<span style='color:#aa0000;'><strong>A New Dev Version is Available.</strong></span>";
         } else {
-            $svnmsg = "<span style='color:#00aa00;'><strong>You have the Latest Beta Version.</strong></span>";
+            $svnmsg = "<span style='color:#00aa00;'><strong>You have the Latest Dev Version.</strong></span>";
         }
 
         if (strlen($version['git']) > 8 || $version['git'] == "") {
             $version['git'] = "<span style='color:#aa0000;'>Error</span>";
-            $svnmsg = "<span style='color:#aa0000;'><strong>Error retrieving latest Beta Release.</strong></span>";
+            $svnmsg = "<span style='color:#aa0000;'><strong>Error retrieving latest Dev Version.</strong></span>";
         }
         $msg .= "<br>".$svnmsg;
         $objResponse->addAssign("svnrev", "innerHTML",  $version['git']);

web/init.php

@@ -113,9 +113,11 @@
         $json = json_decode(file_get_contents('version.json'), true);
         define('SB_VERSION', $json['version']);
         define('SB_GITREV', $json['git']);
+        define('SB_DEV', $json['dev']);
     } else {
         define('SB_VERSION', 'N/A');
         define('SB_GITREV', '0');
+        define('SB_DEV', false);
     }
 }
 define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);

web/pages/footer.php

@@ -31,7 +31,7 @@
 }
 
 global $theme;
-$theme->assign('SB_REV', defined('SB_GIT') ? "-git" . SB_GITREV : '');
+$theme->assign('SB_REV', (SB_DEV) ? "-git" . SB_GITREV : '');
 $theme->assign('SB_VERSION', SB_VERSION);
 $theme->assign('SB_QUOTE', CreateQuote());
 $theme->display('page_footer.tpl');

web/pages/page.admin.php

@@ -49,7 +49,7 @@
 $theme->assign('access_settings', $userbank->HasAccess(ADMIN_OWNER | ADMIN_WEB_SETTINGS));
 $theme->assign('access_mods', $userbank->HasAccess(ADMIN_OWNER | ADMIN_LIST_MODS | ADMIN_ADD_MODS | ADMIN_EDIT_MODS | ADMIN_DELETE_MODS));
 
-$theme->assign('sb_svn', defined('SB_GIT'));
+$theme->assign('dev', SB_DEV);
 
 $theme->assign('demosize', sizeFormat($demsi['size']));
 $theme->assign('total_admins', $counts['admins']);

web/themes/default/page_admin.tpl

@@ -42,7 +42,7 @@
 				<a href="index.php?p=admin&amp;c=settings">
 				<img src="themes/default/images/admin/settings.png" alt="SourceBans Settings" border="0" /><br />
 				Webpanel Settings
-		  		</a> 
+		  		</a>
 			</li>
 		{/if}
 		{if $access_mods}
@@ -54,7 +54,7 @@
 			</li>
 		{/if}
 	</ul>
-</div>	
+</div>
 <br />
 
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
@@ -70,9 +70,9 @@
 	</tr>
 	<tr>
 		<td class="listtable_1" style="border-right: 3px solid #CFCAC6;">
-			{if $sb_svn}
+			{if $dev}
 				Latest Git: <strong id='svnrev'>Please Wait...</strong>
-			{/if}		
+			{/if}
 		</td>
 		<td class="listtable_1" style="border-right: 3px solid #CFCAC6; border-left: 3px solid #CFCAC6;">&nbsp;</td>
 		<td class="listtable_1" style="border-left: 3px solid #CFCAC6;">Connections Blocked: <strong>{$total_blocks}</strong></td>
@@ -108,4 +108,4 @@
 		<td class="listtable_1" style="border-left: 3px solid #CFCAC6;">&nbsp;</td>
 	</tr>
 </table>
-<script type="text/javascript">xajax_CheckVersion();</script>
+<script type="text/javascript">xajax_CheckVersion();</script>

web/themes/sb_default/page_admin.tpl

@@ -38,7 +38,7 @@
 				<a href="index.php?p=admin&amp;c=settings">
 				<img src="themes/default/images/admin/settings.png" alt="SourceBans Settings" border="0" /><br />
 				Webpanel Settings
-		  		</a> 
+		  		</a>
 			</li>
 		{/if}
 		{if $access_mods}
@@ -50,7 +50,7 @@
 			</li>
 		{/if}
 	</ul>
-</div>	
+</div>
 <br />
 
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
@@ -66,9 +66,9 @@
 	</tr>
 	<tr>
 		<td>
-			{if $sb_svn}
+			{if $dev}
 				Latest Git: <strong id='svnrev'>Please Wait...</strong>
-			{/if}		
+			{/if}
 		</td>
 		<td>&nbsp;</td>
 		<td>Connections Blocked: <strong>{$total_blocks}</strong></td>
@@ -99,4 +99,4 @@
 		<td>&nbsp;</td>
 	</tr>
 </table>
-<script type="text/javascript">xajax_CheckVersion();</script>
+<script type="text/javascript">xajax_CheckVersion();</script>

web/themes/sourcebans_dark/page_admin.tpl

@@ -38,7 +38,7 @@
 				<a href="index.php?p=admin&amp;c=settings">
 				<img src="themes/default/images/admin/settings.png" alt="SourceBans Settings" border="0" /><br />
 				Webpanel Settings
-		  		</a> 
+		  		</a>
 			</li>
 		{/if}
 		{if $access_mods}
@@ -50,7 +50,7 @@
 			</li>
 		{/if}
 	</ul>
-</div>	
+</div>
 <br />
 
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
@@ -66,9 +66,9 @@
 	</tr>
 	<tr>
 		<td>
-			{if $sb_svn}
+			{if $dev}
 				Latest Git: <strong id='svnrev'>Please Wait...</strong>
-			{/if}		
+			{/if}
 		</td>
 		<td>&nbsp;</td>
 		<td>Connections Blocked: <strong>{$total_blocks}</strong></td>
@@ -99,4 +99,4 @@
 		<td>&nbsp;</td>
 	</tr>
 </table>
-<script type="text/javascript">xajax_CheckVersion();</script>
+<script type="text/javascript">xajax_CheckVersion();</script>

web/version.json

@@ -1,4 +1,5 @@
 {
     "version": "1.6.2",
-    "git": "531"
+    "git": "531",
+    "dev": false
 }