Merge pull request #11 from marc1706/master

A few small fixes to upload funtion 
Added link arrows to subsilver2 (by Archivar)
This commit is contained in:
Marc Alexander
2011-05-10 11:37:31 -07:00
4 changed files with 17 additions and 16 deletions

View File

@@ -73,6 +73,7 @@ class portal_upload
{
$this->directory_delete($mod_dir);
}
$compress = new compress_zip('r', $file->destination_file);
$compress->extract($mod_dir . '_tmp/');
$compress->close();
@@ -92,7 +93,7 @@ class portal_upload
$this->directory_move($mod_dir . '_tmp/', $mod_dir);
$new_mod_dir = $mod_dir;
}
$this->directory_delete($mod_dir . '_tmp/');
// make sure we set $mod_dir to the correct folder after the above step
@@ -190,12 +191,12 @@ class portal_upload
}
private function directory_move($src, $dest)
{
{
$src_contents = scandir($src);
if (!is_dir($dest) && is_dir($src))
{
mkdir($dest . '/', octdec(0755));
mkdir($dest . '/', 0755);
}
foreach ($src_contents as $src_entry)
@@ -209,7 +210,7 @@ class portal_upload
else if (is_file($src . '/' . $src_entry) && !is_file($dest . '/' . $src_entry))
{
copy($src . '/' . $src_entry, $dest . '/' . $src_entry);
chmod($dest . '/' . $src_entry, octdec(0644));
chmod($dest . '/' . $src_entry, 0644);
}
}
}

View File

@@ -10,7 +10,7 @@
<!-- BEGIN links -->
<tr class="row1">
<td>
<a href="{portalmenu.links.LINK_URL}">{portalmenu.links.LINK_TITLE}</a>
<a href="{portalmenu.links.LINK_URL}" title="{portalmenu.links.LINK_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{portalmenu.links.LINK_TITLE}</a>
</td>
</tr>
<!-- END links -->

View File

@@ -17,63 +17,63 @@
<!-- IF S_DISPLAY_SEARCH -->
<tr class="row1">
<td>
<a href="{U_NEW_POSTS}">{L_NEW_POSTS}</a>
<a href="{U_NEW_POSTS}" title="{L_NEW_POSTS}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_NEW_POSTS}</a>
</td>
</tr>
<tr class="row1">
<td>
<a href="{U_UNREAD_POSTS}">{L_UNREAD_POSTS}</a>
<a href="{U_UNREAD_POSTS}" title="{L_UNREAD_POSTS}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_UNREAD_POSTS}</a>
</td>
</tr>
<tr class="row1">
<td>
<a href="{U_SELF_POSTS}">{L_SELF_POSTS}</a>
<a href="{U_SELF_POSTS}" title="{L_SELF_POSTS}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_SELF_POSTS}</a>
</td>
</tr>
<!-- ENDIF -->
<!-- IF U_UM_BOOKMARKS -->
<tr class="row1">
<td>
<a href="{U_UM_BOOKMARKS}">{L_UM_BOOKMARKS}</a>
<a href="{U_UM_BOOKMARKS}" title="{L_UM_BOOKMARKS}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_UM_BOOKMARKS}</a>
</td>
</tr>
<!-- ENDIF -->
<!-- IF S_DISPLAY_SUBSCRIPTIONS -->
<tr class="row1">
<td>
<a href="{U_UM_MAIN_SUBSCRIBED}">{L_UM_MAIN_SUBSCRIBED}</a>
<a href="{U_UM_MAIN_SUBSCRIBED}" title="{L_UM_MAIN_SUBSCRIBED}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_UM_MAIN_SUBSCRIBED}</a>
</td>
</tr>
<!-- ENDIF -->
<!-- IF S_DISPLAY_PM -->
<tr class="row1">
<td>
<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>
<a href="{U_PRIVATEMSGS}" title="{L_MESSAGE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{PRIVATE_MESSAGE_INFO}</a>
</td>
</tr>
<!-- ENDIF -->
<tr class="row1">
<td>
<a href="{U_PROFILE}">{L_PROFILE}</a>
<a href="{U_PROFILE}" title="{L_PROFILE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_PROFILE}</a>
</td>
</tr>
<!-- IF U_MCP -->
<tr class="row1">
<td>
<a href="{U_MCP}">{L_MCP}</a>
<a href="{U_MCP}" title="{L_MCP}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_MCP}</a>
</td>
</tr>
<!-- ENDIF -->
<!-- IF U_ACP -->
<tr class="row1">
<td>
<a href="{U_ACP}">{L_M_ACP}</a><br />
<a href="{U_ACP}" title="{L_M_ACP}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_M_ACP}</a><br />
</td>
</tr>
<!-- ENDIF -->
<tr class="row1">
<td>
<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a>
<a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/portal/arrowbullet.gif" width="12" height="11" alt="" />&nbsp;{L_LOGIN_LOGOUT}</a>
</td>
</tr>
</table>

View File

@@ -5,7 +5,7 @@
<!-- IF LEGEND -->
<td class="row1" rowspan="2" align="center" valign="middle"><img src="{T_THEME_PATH}{$WHOS_IMAGES}" alt="{L_WHO_IS_ONLINE}" /></td>
<!-- ELSE -->
<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}{$WHOS_IMAGES}" alt="{L_WHO_IS_ONLINE}" /></td>
<td class="row1" rowspan="2" align="center" valign="middle"><img src="{T_THEME_PATH}{$WHOS_IMAGES}" alt="{L_WHO_IS_ONLINE}" /></td>
<!-- ENDIF -->
<!-- ENDIF -->
<td class="row1" width="100%"><span class="genmed">{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}</span></td>