SilentLittleCat %!s(int64=7) %!d(string=hai) anos
pai
achega
5ee24e48a2
Modificáronse 2 ficheiros con 27 adicións e 26 borrados
  1. 26 25
      .idea/workspace.xml
  2. 1 1
      source/class/discuz/discuz_upload.php

+ 26 - 25
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
+      <change beforePath="$PROJECT_DIR$/source/class/discuz/discuz_upload.php" afterPath="$PROJECT_DIR$/source/class/discuz/discuz_upload.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +13,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="527">
-              <caret line="487" column="0" lean-forward="true" selection-start-line="487" selection-start-column="0" selection-end-line="487" selection-end-column="0" />
+            <state relative-caret-position="217">
+              <caret line="477" column="42" lean-forward="true" selection-start-line="477" selection-start-column="42" selection-end-line="477" selection-end-column="42" />
               <folding />
             </state>
           </provider>
@@ -27,8 +26,8 @@
       <file leaf-file-name="function_forum.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="22103">
-              <caret line="718" column="18" lean-forward="false" selection-start-line="718" selection-start-column="18" selection-end-line="718" selection-end-column="18" />
+            <state relative-caret-position="407">
+              <caret line="718" column="19" lean-forward="false" selection-start-line="718" selection-start-column="19" selection-end-line="718" selection-end-column="19" />
               <folding>
                 <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
                 <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -65,11 +64,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="discuz_upload.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="discuz_upload.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="651">
-              <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+            <state relative-caret-position="398">
+              <caret line="138" column="16" lean-forward="true" selection-start-line="138" selection-start-column="16" selection-end-line="138" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -186,6 +185,7 @@
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
+        <option value="$PROJECT_DIR$/source/class/discuz/discuz_upload.php" />
       </list>
     </option>
   </component>
@@ -297,12 +297,12 @@
       <workItem from="1525701498505" duration="7843000" />
       <workItem from="1525738524458" duration="1328000" />
       <workItem from="1525788960861" duration="7945000" />
-      <workItem from="1525826298814" duration="90000" />
+      <workItem from="1525826298814" duration="547000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="66594000" />
+    <option name="totallyTimeSpent" value="67051000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -652,6 +652,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -678,14 +679,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="651">
-          <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30008">
@@ -697,10 +690,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="477" column="42" lean-forward="true" selection-start-line="477" selection-start-column="42" selection-end-line="477" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22103">
-          <caret line="718" column="18" lean-forward="false" selection-start-line="718" selection-start-column="18" selection-end-line="718" selection-end-column="18" />
+        <state relative-caret-position="407">
+          <caret line="718" column="19" lean-forward="false" selection-start-line="718" selection-start-column="19" selection-end-line="718" selection-end-column="19" />
           <folding>
             <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
             <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -736,10 +737,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+    <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="487" column="0" lean-forward="true" selection-start-line="487" selection-start-column="0" selection-end-line="487" selection-end-column="0" />
+        <state relative-caret-position="398">
+          <caret line="138" column="16" lean-forward="true" selection-start-line="138" selection-start-column="16" selection-end-line="138" selection-end-column="16" />
           <folding />
         </state>
       </provider>

+ 1 - 1
source/class/discuz/discuz_upload.php

xqd
@@ -135,7 +135,7 @@ Class discuz_upload{
 
 	function get_target_filename($type, $extid = 0, $forcename = '') {
 		if($type == 'group' || ($type == 'common' && $forcename != '')) {
-			$filename = $type.'_'.intval($extid).($forcename != '' ? "_$forcename" : '');
+			$filename = $type.'_'.intval($extid).($forcename != '' ? "_$forcename" : '').random(8);
 		} else {
 			$filename = date('His').strtolower(random(16));
 		}