Small update to smileys/text2icons function and theme list.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@8 2b68903e-0b30-0410-9a39-a2e4f3c5be39

diff --git a/inc/filename.php b/inc/filename.php
index d9bbfe5..3a84ba0 100644 (file)
--- a/inc/filename.php
+++ b/inc/filename.php
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/\r
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/\r
 \r
-    $FileInfo: filename.php - Last Update: 05/17/2007 SVN 7 - Author: cooldude2k $\r
+    $FileInfo: filename.php - Last Update: 05/19/2007 SVN 8 - Author: cooldude2k $\r
 */\r
 $File1Name = dirname($_SERVER['SCRIPT_NAME'])."/";\r
 $File2Name = $_SERVER['SCRIPT_NAME'];\r
@@ -45,8 +45,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        if($showsvn!=true&&$showsvn!=null) { $return_var .= " ".$showsvn." ".$svnver; }\r
        return $return_var; }\r
 $VER1[0] = 0; $VER1[1] = 1; $VER1[2] = 5; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];\r
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 7; $RName = "iDB"; $SFName = "IntDB";\r
-$SVNDay[0] = 5; $SVNDay[1] = 17; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];\r
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 8; $RName = "iDB"; $SFName = "IntDB";\r
+$SVNDay[0] = 5; $SVNDay[1] = 19; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];\r
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);\r
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);\r
 $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false);\r

diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index a90b8fb..830cad7 100644 (file)
--- a/inc/misc/functions.php
+++ b/inc/misc/functions.php
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/\r
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/\r
 \r
-    $FileInfo: functions.php - Last Update: 05/14/2007 SVN 6 - Author: cooldude2k $\r
+    $FileInfo: functions.php - Last Update: 05/19/2007 SVN 8 - Author: cooldude2k $\r
 */\r
 $File1Name = dirname($_SERVER['SCRIPT_NAME'])."/";\r
 $File2Name = $_SERVER['SCRIPT_NAME'];\r
@@ -61,7 +61,7 @@ function change_title($new_title,$use_gzip="off",$gzip_type="gzip") {
 global $Settings;\r
 if($gzip_type!="gzip") { if($gzip_type!="deflate") { $gzip_type = "gzip"; } }\r
 $output = @ob_get_clean();\r
-$output = preg_replace("/<title>(.*?)<\/title>/", "<title>".$new_title."</title>", $output);\r
+$output = preg_replace("/<title>(.*?)<\/title>/i", "<title>".$new_title."</title>", $output);\r
 /* Change Some PHP Settings Fix the &PHPSESSID to &amp;PHPSESSID */\r
 $SessName = @session_name();\r
 $output = preg_replace("/&PHPSESSID/", "&amp;PHPSESSID", $output);\r
@@ -134,20 +134,28 @@ $varname = preg_replace("/(HTTP_GET_VARS|HTTP_POST_VARS|HTTP_POST_FILES)/i", nul
        return $varname; }\r
 function text2icons($Text,$sqlt) {\r
 global $Settings;\r
-$renquery="SELECT * FROM ".$sqlt."smileys";\r
-$renresult=mysql_query($renquery);\r
-$rennum=mysql_num_rows($renresult);\r
-$reni=0;\r
-while ($reni < $rennum) {\r
-$FileName=mysql_result($renresult,$reni,"FileName");\r
-$SmileName=mysql_result($renresult,$reni,"SmileName");\r
-$SmileText=mysql_result($renresult,$reni,"SmileText");\r
-$SmileDirectory=mysql_result($renresult,$reni,"Directory");\r
-$ShowSmile=mysql_result($renresult,$reni,"Show");\r
-$Smile1 = array($SmileText);\r
-$Smile2 = array('<img src="'.$SmileDirectory.''.$FileName.'" style="vertical-align: middle; border: 0px;" title="'.$SmileName.'" alt="'.$SmileName.'" />');\r
-$Text=str_replace($Smile1, $Smile2, $Text);\r
-++$reni; } return $Text; }\r
+$reneequery="SELECT * FROM ".$sqlt."smileys";\r
+$reneeresult=mysql_query($reneequery);\r
+$reneenum=mysql_num_rows($reneeresult);\r
+$reneei=0;\r
+while ($reneei < $reneenum) {\r
+$FileName=mysql_result($reneeresult,$reneei,"FileName");\r
+$SmileName=mysql_result($reneeresult,$reneei,"SmileName");\r
+$SmileText=mysql_result($reneeresult,$reneei,"SmileText");\r
+$SmileDirectory=mysql_result($reneeresult,$reneei,"Directory");\r
+$ShowSmile=mysql_result($reneeresult,$reneei,"Show");\r
+$ReplaceType=mysql_result($reneeresult,$reneei,"ReplaceCI");\r
+if($ReplaceType=="on") { $ReplaceType = "yes"; }\r
+if($ReplaceType=="off") { $ReplaceType = "no"; }\r
+if($ReplaceType!="yes"||$ReplaceType!="no") { $ReplaceType = "no"; }\r
+$Smile1 = $SmileText;\r
+$Smile2 = '<img src="'.$SmileDirectory.''.$FileName.'" style="vertical-align: middle; border: 0px;" title="'.$SmileName.'" alt="'.$SmileName.'" />';\r
+if($ReplaceType=="no") {\r
+$Text = str_replace($Smile1, $Smile2, $Text); }\r
+if($ReplaceType=="yes") {\r
+       $Smile1 = preg_quote($SmileText,"/");\r
+$Text = preg_replace("/".$Smile1."/i",$Smile2,$Text); }\r
+++$reneei; } return $Text; }\r
 function remove_spaces($Text) {\r
 $Text = preg_replace("/(^\t+|\t+$)/","",$Text);\r
 $Text = preg_replace("/(^\n+|\n+$)/","",$Text);\r

diff --git a/inc/profilemain.php b/inc/profilemain.php
index 5200cc6..0bb731f 100644 (file)
--- a/inc/profilemain.php
+++ b/inc/profilemain.php
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: profilemain.php - Last Update: 05/09/2007 SVN 1 - Author: cooldude2k $
+    $FileInfo: profilemain.php - Last Update: 05/19/2007 SVN 8 - Author: cooldude2k $
 */
 $File1Name = dirname($_SERVER['SCRIPT_NAME'])."/";
 $File2Name = $_SERVER['SCRIPT_NAME'];
@@ -298,14 +298,19 @@ echo "<option value=\"".$plusi."\">GMT + ".$plusi.":00 hours</option>\n";
 $skindir = dirname(realpath("settings.php"))."/".$SettDir['themes'];
 if ($handle = opendir($skindir)) {
    while (false !== ($file = readdir($handle))) {
+          if ($dirnum==null) { $dirnum = 0; }
           if (file_exists($skindir.$file."/info.php")) {
                   if ($file != "." && $file != "..") {
           include($skindir.$file."/info.php");
-       echo "<option value=\"".$file."\">".$ThemeInfo['ThemeName']."</option>\n";
+       $themelist[$dirnum] =  "<option value=\"".$file."\">".$ThemeInfo['ThemeName']."</option>";
+          ++$dirnum;
    } } }
-   closedir($handle);
-} ?>
-</select></td>
+   closedir($handle); asort($themelist);
+   $themenum=count($themelist); $themei=0; 
+   while ($themei < $themenum) {
+   echo $themelist[$themei]."\n";
+   ++$themei; }
+} ?></select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 40%;"><label class="TextBoxLabel" for="DST">Is <span title="Daylight Savings Time">DST</span> / <span title="Summer Time">ST</span> on or off:</label></td>
        <td style="width: 60%;"><select id="DST" name="DST" class="TextBox"><?php echo "\n" ?>

diff --git a/setup/mktable.php b/setup/mktable.php
index e354063..a172ba7 100644 (file)
--- a/setup/mktable.php
+++ b/setup/mktable.php
@@ -12,7 +12,7 @@
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mktable.php - Last Update: 05/09/2007 SVN 1 - Author: cooldude2k $
+    $FileInfo: mktable.php - Last Update: 05/19/2007 SVN 8 - Author: cooldude2k $
 */
 $File1Name = dirname($_SERVER['SCRIPT_NAME'])."/";
 $File2Name = $_SERVER['SCRIPT_NAME'];
@@ -34,7 +34,7 @@ $query="CREATE TABLE `".$_POST['tableprefix']."messenger` ( `id` int(15) NOT NUL
 mysql_query($query);
 $query="CREATE TABLE `".$_POST['tableprefix']."posts` ( `id` int(15) NOT NULL auto_increment, `TopicID` int(15) NOT NULL default '0', `ForumID` int(15) NOT NULL default '0', `CategoryID` int(15) NOT NULL default '0', `UserID` int(15) NOT NULL default '0', `GuestName` varchar(150) NOT NULL default '', `TimeStamp` int(15) NOT NULL default '0', `LastUpdate` int(15) NOT NULL default '0', `EditUser` int(15) NOT NULL default '0', `Post` text NOT NULL, `Description` text NOT NULL, `IP` varchar(20) NOT NULL default '', PRIMARY KEY  (`id`)) TYPE=MyISAM ;";
 mysql_query($query);
-$query="CREATE TABLE `".$_POST['tableprefix']."smileys` ( `id` int(15) NOT NULL auto_increment, `FileName` text NOT NULL, `SmileName` text NOT NULL, `SmileText` text NOT NULL, `Directory` text NOT NULL, `Show` varchar(15) NOT NULL default '', PRIMARY KEY  (`id`)) TYPE=MyISAM ;";
+$query="CREATE TABLE `".$_POST['tableprefix']."smileys` ( `id` int(15) NOT NULL auto_increment, `FileName` text NOT NULL, `SmileName` text NOT NULL, `SmileText` text NOT NULL, `Directory` text NOT NULL, `Show` varchar(5) NOT NULL default '', `ReplaceCI` varchar(5) NOT NULL default '', PRIMARY KEY  (`id`)) TYPE=MyISAM ;";
 mysql_query($query);
 /*
 $query="CREATE TABLE `".$_POST['tableprefix']."tagboard` ( `id` int(15) NOT NULL auto_increment, `UserID` int(15) NOT NULL default '0', `GuestName` varchar(150) NOT NULL default '', `TimeStamp` int(15) NOT NULL default '0', `Post` text NOT NULL, `IP` varchar(20) NOT NULL default '', PRIMARY KEY  (`id`)) TYPE=MyISAM ;";
@@ -55,6 +55,6 @@ $query = "INSERT INTO ".$_POST['tableprefix']."permissions VALUES (1, 1, 'Admin'
 mysql_query($query);
 $query = "INSERT INTO ".$_POST['tableprefix']."catpermissions VALUES (1, 1, 'Admin', 1, 'yes'), (2, 2, 'Moderator', 1, 'yes'), (3, 3, 'Member', 1, 'yes'), (4, 4, 'Guest', 1, 'yes'), (5, 5, 'Banned', 1, 'no'), (6, 6, 'Validate', 1, 'yes');"; 
 mysql_query($query);
-$query = "INSERT INTO ".$_POST['tableprefix']."smileys VALUES (1, 'smile.gif', 'Happy', ':)', 'smileys/', 'yes'), (2, 'tongue.gif', 'Tongue', ':P', 'smileys/', 'yes'), (3, 'tongue2.gif', 'Tongue', ':tongue:', 'smileys/', 'yes'), (4, 'sweat.gif', 'Sweat', ':sweat:', 'smileys/', 'yes'), (5, 'laugh.gif', 'lol', ':lol:', 'smileys/', 'yes'), (6, 'cool.gif', 'Cool', 'B)', 'smileys/', 'yes'), (7, 'sleep.gif', 'Sleep', '-_-', 'smileys/', 'yes'), (8, 'sad.gif', 'Sad', ':(', 'smileys/', 'yes'), (9, 'angry.gif', 'Angry', ':angry:', 'smileys/', 'yes'), (10, 'huh.gif', 'huh', ':huh:', 'smileys/', 'yes'), (11, 'ohmy.gif', 'ohmy', ':o', 'smileys/', 'yes'), (12, 'hmm.gif', 'hmm', ':unsure:', 'smileys/', 'yes'), (13, 'mad.gif', 'Mad', ':mad:', 'smileys/', 'yes'), (14, 'wub.gif', 'Wub', ':wub:', 'smileys/', 'yes'), (15, 'x.gif', 'X', ':x:', 'smileys/', 'yes');";
+$query = "INSERT INTO ".$_POST['tableprefix']."smileys VALUES (1, 'smile.gif', 'Happy', ':)', 'smileys/', 'yes', 'no'), (2, 'tongue.gif', 'Tongue', ':P', 'smileys/', 'yes', 'yes'), (3, 'tongue2.gif', 'Tongue', ':tongue:', 'smileys/', 'yes', 'yes'), (4, 'sweat.gif', 'Sweat', ':sweat:', 'smileys/', 'yes', 'yes'), (5, 'laugh.gif', 'lol', ':lol:', 'smileys/', 'yes', 'yes'), (6, 'cool.gif', 'Cool', 'B)', 'smileys/', 'yes', 'no'), (7, 'sleep.gif', 'Sleep', '-_-', 'smileys/', 'yes', 'no'), (8, 'sad.gif', 'Sad', ':(', 'smileys/', 'yes', 'no'), (9, 'angry.gif', 'Angry', ':angry:', 'smileys/', 'yes', 'yes'), (10, 'huh.gif', 'huh', ':huh:', 'smileys/', 'yes', 'yes'), (11, 'ohmy.gif', 'ohmy', ':o', 'smileys/', 'yes', 'yes'), (12, 'hmm.gif', 'hmm', ':unsure:', 'smileys/', 'yes', 'yes'), (13, 'mad.gif', 'Mad', ':mad:', 'smileys/', 'yes', 'yes'), (14, 'wub.gif', 'Wub', ':wub:', 'smileys/', 'yes', 'yes'), (15, 'x.gif', 'X', ':x:', 'smileys/', 'yes', 'yes');";
 mysql_query($query);
 ?>
\ No newline at end of file

diff --git a/setup/setup.php b/setup/setup.php
index 7fdf651..70c8207 100644 (file)
--- a/setup/setup.php
+++ b/setup/setup.php
@@ -12,7 +12,7 @@
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: setup.php - Last Update: 05/14/2007 SVN 6 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 05/19/2007 SVN 8 - Author: cooldude2k $
 */
 $File1Name = dirname($_SERVER['SCRIPT_NAME'])."/";
 $File2Name = $_SERVER['SCRIPT_NAME'];
@@ -151,7 +151,7 @@ echo "<option value=\"".$plusi."\">GMT + ".$plusi.":00 hours</option>\n"; }
 <option value="true">on</option>
 </select></td>
 </tr><tr>
-       <td style="width: 50%;"><label class="TextBoxLabel" for="unlink">Delete Installer When Done?(Might not work)</label></td>
+       <td style="width: 50%;"><label class="TextBoxLabel" title="Might not work" for="unlink">Delete Installer When Done? (Might not work)</label></td>
        <td style="width: 50%;"><select id="unlink" name="unlink" class="TextBox">
 <option value="true">Yes</option>
 <option value="false">No</option>